Description:
Tidy code.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
| @@ -7,7 +7,6 | |||
|
|
7 | 7 | using Microsoft.Xna.Framework.Media; |
|
|
8 | 8 | |
|
|
9 | 9 | |
|
|
10 | ||
|
|
11 | 10 | using System; |
|
|
12 | 11 | using System.IO; |
|
|
13 | 12 | using SpriteFontPlus; |
| @@ -330,8 +329,6 | |||
|
|
330 | 329 | this.newsItems.AddRange(NewsItem.FromYaml(sr_pregenerated.ReadToEnd())); |
|
|
331 | 330 | } |
|
|
332 | 331 | this.simulation.LoadContent(this.newsItems, this.grammar); |
|
|
333 | // this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle(); | |
|
|
334 | ||
|
|
335 | 332 | |
|
|
336 | 333 | this.remainingDialog = new Queue<Node<DialogOption>>(); |
|
|
337 | 334 | |
| @@ -345,8 +342,6 | |||
|
|
345 | 342 | this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0); |
|
|
346 | 343 | |
|
|
347 | 344 | Logging.Success("Content loaded."); |
|
|
348 | ||
|
|
349 | ||
|
|
350 | 345 | } |
|
|
351 | 346 | |
|
|
352 | 347 | |
| @@ -370,7 +365,6 | |||
|
|
370 | 365 | |
|
|
371 | 366 | Vector2 calculateMousegrid(Vector2 normalizedMousePos) |
|
|
372 | 367 | { |
|
|
373 | ||
|
|
374 | 368 | //int gridx = (int)(normalizedMousePos.X / Tile.TileSpriteWidth); |
|
|
375 | 369 | //int gridy = (int)(normalizedMousePos.Y / Tile.TileSpriteHeight); |
|
|
376 | 370 | Vector2 adjust = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); |
| @@ -424,9 +418,6 | |||
|
|
424 | 418 | return new Vector2(gridx, gridy); |
|
|
425 | 419 | } |
|
|
426 | 420 | */ |
|
|
427 | ||
|
|
428 | ||
|
|
429 | ||
|
|
430 | 421 | } |
|
|
431 | 422 | |
|
|
432 | 423 | |
| @@ -441,8 +432,6 | |||
|
|
441 | 432 | float pitch = 0.0f; |
|
|
442 | 433 | float pan = 0.0f; |
|
|
443 | 434 | |
|
|
444 | ||
|
|
445 | // Run game logic in here. Do NOT render anything here! | |
|
|
446 | 435 | KeyboardState keyboardCur = Keyboard.GetState(); |
|
|
447 | 436 | |
|
|
448 | 437 | #region input |
| @@ -544,8 +533,6 | |||
|
|
544 | 533 | |
|
|
545 | 534 | protected override void Draw(GameTime gameTime) |
|
|
546 | 535 | { |
|
|
547 | // Render stuff in here. Do NOT run game logic in here! | |
|
|
548 | ||
|
|
549 | 536 | frameCounter++; |
|
|
550 | 537 | |
|
|
551 | 538 | string fps = string.Format("fps: {0}", frameRate); |
| @@ -811,15 +798,12 | |||
|
|
811 | 798 | if (this.showBudget) |
|
|
812 | 799 | { |
|
|
813 | 800 | budgetWindow.draw(batch); |
|
|
814 | ||
|
|
815 | 801 | } |
|
|
816 | 802 | |
|
|
817 | 803 | #endregion budget |
|
|
818 | 804 | |
|
|
819 | 805 | batch.End(); |
|
|
820 | 806 | |
|
|
821 | ||
|
|
822 | ||
|
|
823 | 807 | |
|
|
824 | 808 | #region debug_window |
|
|
825 | 809 | //Calcs for debug window: |
| @@ -848,7 +832,6 | |||
|
|
848 | 832 | } |
|
|
849 | 833 | */ |
|
|
850 | 834 | |
|
|
851 | ||
|
|
852 | 835 | DebugInfo debugInfo = new DebugInfo |
|
|
853 | 836 | { fps = this.frameRate, |
|
|
854 | 837 | pastFps = past_fps.ToArray(), |
| @@ -916,12 +899,9 | |||
|
|
916 | 899 | |
|
|
917 | 900 | #endregion debug_window |
|
|
918 | 901 | |
|
|
919 | ||
|
|
920 | ||
|
|
921 | 902 | stopWatch.Stop(); |
|
|
922 | 903 | this.drawTime = stopWatch.Elapsed; |
|
|
923 | 904 | |
|
|
924 | 905 | base.Draw(gameTime); |
|
|
925 | 906 | } |
|
|
926 | ||
|
|
927 | 907 | } |
| @@ -96,6 +96,9 | |||
|
|
96 | 96 | <None Include="Content\part4_tileset.png"> |
|
|
97 | 97 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
|
|
98 | 98 | </None> |
|
|
99 | <None Include="Content\part4_tileset_alt.png"> | |
|
|
100 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |
|
|
101 | </None> | |
|
|
99 | 102 | <None Include="Content\solid_tileset.png"> |
|
|
100 | 103 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
|
|
101 | 104 | </None> |
You need to be logged in to leave comments.
Login now