Description:
Delete vestigal dialog code.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -84,15 +84,12 | |||||
|
84 | public ImageMap imageMap; |
|
84 | public ImageMap imageMap; |
|
85 |
|
85 | ||
|
86 | public bool show_another_window; |
|
86 | public bool show_another_window; |
|
87 | private bool showInitial; |
|
||
|
88 |
|
87 | ||
|
89 | public Story Story; |
|
88 | public Story Story; |
|
90 |
|
89 | ||
|
91 | //buggy |
|
90 | //buggy |
|
92 | private static bool enableCulling = false; |
|
91 | private static bool enableCulling = false; |
|
93 |
|
92 | ||
|
94 | private Node<DialogOption> currentNode; |
|
||
|
95 | private Queue<Node<DialogOption>> remainingDialog; |
|
||
|
96 | private List<NewsItem> newsItems; |
|
93 | private List<NewsItem> newsItems; |
|
97 |
|
94 | ||
|
98 |
|
95 | ||
@@ -159,7 +156,6 | |||||
|
159 | this.simulation = new Simulation(this.squaresAcross, this.squaresDown, new float[] {16.66667f*240, 16.66667f*120, 16.66667f*60, 16.66667f*30f, 16.66667f*1 }); |
|
156 | this.simulation = new Simulation(this.squaresAcross, this.squaresDown, new float[] {16.66667f*240, 16.66667f*120, 16.66667f*60, 16.66667f*30f, 16.66667f*1 }); |
|
160 |
|
157 | ||
|
161 |
|
158 | ||
|
162 | showInitial = true; |
|
||
|
163 | showBudget = false; |
|
159 | showBudget = false; |
|
164 | showForest = false; |
|
160 | showForest = false; |
|
165 | showNews = false; |
|
161 | showNews = false; |
@@ -170,7 +166,6 | |||||
|
170 |
|
166 | ||
|
171 | Content.RootDirectory = "Content"; |
|
167 | Content.RootDirectory = "Content"; |
|
172 |
|
168 | ||
|
173 | currentNode = DialogTrees.introTree; |
|
||
|
174 |
|
169 | ||
|
175 | } |
|
170 | } |
|
176 |
|
171 | ||
@@ -360,8 +355,6 | |||||
|
360 | } |
|
355 | } |
|
361 | this.simulation.LoadContent(this.newsItems, this.grammar); |
|
356 | this.simulation.LoadContent(this.newsItems, this.grammar); |
|
362 |
|
357 | ||
|
363 | this.remainingDialog = new Queue<Node<DialogOption>>(); |
|
||
|
364 |
|
|||
|
365 | this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0); |
|
358 | this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0); |
|
366 |
|
359 | ||
|
367 | Logging.Success("Content loaded."); |
|
360 | Logging.Success("Content loaded."); |
@@ -506,12 +499,6 | |||||
|
506 | } |
|
499 | } |
|
507 |
|
500 | ||
|
508 |
|
501 | ||
|
509 | if (!this.showInitial && this.remainingDialog.Count > 0) |
|
||
|
510 | { |
|
||
|
511 | this.currentNode = this.remainingDialog.Dequeue(); |
|
||
|
512 | this.showInitial = true; |
|
||
|
513 | } |
|
||
|
514 |
|
|||
|
515 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); |
|
502 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); |
|
516 |
|
503 | ||
|
517 | //int gridx = (int)((this.original_point.X-baseOffsetX) / Tile.TileStepX); |
|
504 | //int gridx = (int)((this.original_point.X-baseOffsetX) / Tile.TileStepX); |
@@ -837,11 +824,6 | |||||
|
837 | batch.End(); |
|
824 | batch.End(); |
|
838 |
|
825 | ||
|
839 | #region window |
|
826 | #region window |
|
840 | if (this.currentNode != null) |
|
||
|
841 | { |
|
||
|
842 | // this.currentNode = DialogInterface.RenderDialog(ref this.showInitial, |
|
||
|
843 | // ref this.simulation.paused, debugWindow.monoFont, this.currentNode); |
|
||
|
844 | } |
|
||
|
845 |
|
827 | ||
|
846 | if (this.showForest) |
|
828 | if (this.showForest) |
|
847 | { |
|
829 | { |
@@ -980,8 +962,4 | |||||
|
980 | this.gdm.ApplyChanges(); |
|
962 | this.gdm.ApplyChanges(); |
|
981 | } |
|
963 | } |
|
982 |
|
964 | ||
|
983 | public void enqueueDialog(Node<DialogOption> tree) |
|
||
|
984 | { |
|
||
|
985 | this.remainingDialog.Enqueue(tree); |
|
||
|
986 | } |
|
||
|
987 | } |
|
965 | } |
You need to be logged in to leave comments.
Login now