Description:
Remove some dead code.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
| @@ -122,8 +122,6 | |||||
|
|
122 |
|
122 | ||
|
|
123 | public bool quit = false; |
|
123 | public bool quit = false; |
|
|
124 |
|
124 | ||
|
|
125 |
|
|||
|
|
126 |
|
|||
|
|
127 | [STAThread] |
|
125 | [STAThread] |
|
|
128 | private static void Main(string[] args) |
|
126 | private static void Main(string[] args) |
|
|
129 | { |
|
127 | { |
| @@ -155,8 +153,6 | |||||
|
|
155 | { |
|
153 | { |
|
|
156 | Logging.Debug("Loaded: " + assembly.ToString() + "\n"); |
|
154 | Logging.Debug("Loaded: " + assembly.ToString() + "\n"); |
|
|
157 | } |
|
155 | } |
|
|
158 | ; |
|
||
|
|
159 |
|
|||
|
|
160 | #endif |
|
156 | #endif |
|
|
161 | this.gdm = new GraphicsDeviceManager(this) { |
|
157 | this.gdm = new GraphicsDeviceManager(this) { |
|
|
162 | // Typically you would load a config here... |
|
158 | // Typically you would load a config here... |
| @@ -169,7 +165,6 | |||||
|
|
169 |
|
165 | ||
|
|
170 | this.simulation = new Simulation(this.squaresAcross, this.squaresDown, new float[] {16.66667f*240, 16.66667f*120, 16.66667f*60, 16.66667f*30, 16.66667f*1 }); |
|
166 | this.simulation = new Simulation(this.squaresAcross, this.squaresDown, new float[] {16.66667f*240, 16.66667f*120, 16.66667f*60, 16.66667f*30, 16.66667f*1 }); |
|
|
171 |
|
167 | ||
|
|
172 |
|
|||
|
|
173 | showBudget = false; |
|
168 | showBudget = false; |
|
|
174 | showGrid = true; |
|
169 | showGrid = true; |
|
|
175 | showTrees = true; |
|
170 | showTrees = true; |
| @@ -546,7 +541,6 | |||||
|
|
546 | this.showBudget = this.budgetWindow.update(mouseCur, this.simulation.latestBudget, this.simulation.previousBudget); |
|
541 | this.showBudget = this.budgetWindow.update(mouseCur, this.simulation.latestBudget, this.simulation.previousBudget); |
|
|
547 | } |
|
542 | } |
|
|
548 |
|
543 | ||
|
|
549 |
|
|||
|
|
550 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); |
|
544 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); |
|
|
551 |
|
545 | ||
|
|
552 | this.mouseGrid = this.calculateMousegrid(this.original_point); |
|
546 | this.mouseGrid = this.calculateMousegrid(this.original_point); |
| @@ -706,38 +700,6 | |||||
|
|
706 | //reset |
|
700 | //reset |
|
|
707 | this.tilesDrawn = 0; |
|
701 | this.tilesDrawn = 0; |
|
|
708 |
|
702 | ||
|
|
709 | /* |
|
||
|
|
710 | var scale_factor = 1; |
|
||
|
|
711 | var x_adjust = scale_factor > 1 ? -scale_factor : 0; |
|
||
|
|
712 | var y_adjust = scale_factor > 1 ? -scale_factor/2 : 0; |
|
||
|
|
713 |
|
|||
|
|
714 | for (int y = y_adjust; y < this.squaresDown + y_adjust; y += scale_factor) |
|
||
|
|
715 | { |
|
||
|
|
716 | for (int x = x_adjust; x < this.squaresAcross + x_adjust; x += scale_factor) |
|
||
|
|
717 | { |
|
||
|
|
718 | int screenx = (x - y) * (Tile.TileSpriteWidth) / 2 - 3*scale_factor; |
|
||
|
|
719 | int screeny = (x + y) * (Tile.TileSpriteHeight) / 2; |
|
||
|
|
720 |
|
|||
|
|
721 | // if (this.cull(x, y)) |
|
||
|
|
722 | // { |
|
||
|
|
723 | batch.Draw( |
|
||
|
|
724 | Tile.TileSetTexture, |
|
||
|
|
725 | new Rectangle( |
|
||
|
|
726 | screenx, |
|
||
|
|
727 | screeny, |
|
||
|
|
728 | Tile.TileWidth * scale_factor, Tile.TileHeight * scale_factor), |
|
||
|
|
729 | Tile.GetSourceRectangle(1), |
|
||
|
|
730 | Color.White, |
|
||
|
|
731 | 0.0f, |
|
||
|
|
732 | Vector2.Zero, |
|
||
|
|
733 | SpriteEffects.None, |
|
||
|
|
734 | 0.9f); |
|
||
|
|
735 |
|
|||
|
|
736 | this.tilesDrawn++; |
|
||
|
|
737 | // } |
|
||
|
|
738 | } |
|
||
|
|
739 | }*/ |
|
||
|
|
740 |
|
|||
|
|
741 | for (int i = 0; i < this.simulation.map.MapHeight; i++) |
|
703 | for (int i = 0; i < this.simulation.map.MapHeight; i++) |
|
|
742 | { |
|
704 | { |
|
|
743 | for (int j = 0; j < this.simulation.map.MapWidth; j += 1) |
|
705 | for (int j = 0; j < this.simulation.map.MapWidth; j += 1) |
| @@ -910,22 +872,10 | |||||
|
|
910 | else { |
|
872 | else { |
|
|
911 | drawTileAt(i, j, 122, 2); //122, 203, 221 |
|
873 | drawTileAt(i, j, 122, 2); //122, 203, 221 |
|
|
912 | } |
|
874 | } |
|
|
913 | // if ((i + j) % 8 == 0) |
|
||
|
|
914 | // { |
|
||
|
|
915 | // drawTileAt(i, j, 141, 2); |
|
||
|
|
916 | // } |
|
||
|
|
917 | // else |
|
||
|
|
918 | // { |
|
||
|
|
919 | // drawTileAt(i, j, 142, 2); |
|
||
|
|
920 | // } |
|
||
|
|
921 | } |
|
875 | } |
|
|
922 | else if (this.simulation.map.cells[i][j].Status == CellStatus.DeadTree) { |
|
876 | else if (this.simulation.map.cells[i][j].Status == CellStatus.DeadTree) { |
|
|
923 | drawTileAt(i, j, 141, 2); |
|
877 | drawTileAt(i, j, 141, 2); |
|
|
924 | // System.Console.WriteLine(String.Format("Drew Dead Tree at {0},{1}", i, j)); |
|
||
|
|
925 | } |
|
878 | } |
|
|
926 | // else if (this.simulation.map.cells[i][j].Status == CellStatus.Water) { |
|
||
|
|
927 | // drawWaterTileAt(i, j, 1); |
|
||
|
|
928 | // } |
|
||
|
|
929 | } |
|
879 | } |
|
|
930 | } |
|
880 | } |
|
|
931 | } |
|
881 | } |
You need to be logged in to leave comments.
Login now