alysbrooks-public » games » isometric-park-fna

Commit r446:dee18095905f public

parent | child
Description:
Fix a bunch of warnings.
Commit status:
[Not Reviewed]
References:
m5-events
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r446:dee18095905f -

Show file before | Show file after | Show commentsHide comments
@@ -48,14 +48,12
48 {
48 {
49 case ProfanityLevel.Uncensored:
49 case ProfanityLevel.Uncensored:
50 return s;
50 return s;
51 break;
52 case ProfanityLevel.Minced:
51 case ProfanityLevel.Minced:
53 foreach (var item in replacements)
52 foreach (var item in replacements)
54 {
53 {
55 s = s.Replace(item.Key, item.Value);
54 s = s.Replace(item.Key, item.Value);
56 }
55 }
57 return s;
56 return s;
58 break;
59 case ProfanityLevel.Removed:
57 case ProfanityLevel.Removed:
60 return Regex.Replace(s, "(?i)((?<=d)amn|(?<=f)uck|(?<=D)amn|(?<=F)uck)", "------");
58 return Regex.Replace(s, "(?i)((?<=d)amn|(?<=f)uck|(?<=D)amn|(?<=F)uck)", "------");
61 }
59 }
Show file before | Show file after | Show commentsHide comments
@@ -40,7 +40,8
40 EnforcementLevel.Unspecified => 0,
40 EnforcementLevel.Unspecified => 0,
41 EnforcementLevel.NoEnforcement => 0,
41 EnforcementLevel.NoEnforcement => 0,
42 EnforcementLevel.EnforcedWithWarnings => 100,
42 EnforcementLevel.EnforcedWithWarnings => 100,
43 EnforcementLevel.EnforcedWithFines => 100
43 EnforcementLevel.EnforcedWithFines => 100,
44 _ => 0 //C# enums can take on non-declared vaues. Sigh.
44 };
45 };
45
46
46 SetComponent<BudgetLineComponent>(entity,
47 SetComponent<BudgetLineComponent>(entity,
Show file before | Show file after | Show commentsHide comments
@@ -64,8 +64,8
64 }
64 }
65
65
66 Debug.Assert(ImageMapTexture != null);
66 Debug.Assert(ImageMapTexture != null);
67 Debug.Assert(tileHeight != null);
67 // Debug.Assert(tileHeight != null);
68 Debug.Assert(tileWidth != null);
68 // Debug.Assert(tileWidth != null);
69 Logging.Info("Constructed ImageMap.");
69 Logging.Info("Constructed ImageMap.");
70
70
71
71
Show file before | Show file after | Show commentsHide comments
@@ -120,7 +120,7
120
120
121 public static bool hadFocus = false;
121 public static bool hadFocus = false;
122
122
123 public static ImGuiImageMap map;
123 public static ImGuiImageMap? map;
124 private static IntPtr _imGuiTexture;
124 private static IntPtr _imGuiTexture;
125
125
126 public static void LoadContent(ImGuiRenderer _imGuiRenderer,
126 public static void LoadContent(ImGuiRenderer _imGuiRenderer,
@@ -157,10 +157,18
157 ImGui.Columns(2);
157 ImGui.Columns(2);
158 ImGui.SetColumnWidth(0, 120);
158 ImGui.SetColumnWidth(0, 120);
159
159
160
161 if (DialogInterface.map != null)
162 {
160 var metadata = DialogInterface.map.Metadata[imageIndex];
163 var metadata = DialogInterface.map.Metadata[imageIndex];
161 String Tooltip = String.Format("{0}\n\nSource: {1}", metadata.Description, metadata.Source);
164 String Tooltip = String.Format("{0}\n\nSource: {1}", metadata.Description, metadata.Source);
165 Widgets.MapImageTooltip(DialogInterface.map, new Num.Vector2(111, 148), imageIndex, DialogInterface.map.Metadata[imageIndex].Description);
162
166
163 Widgets.MapImageTooltip(DialogInterface.map, new Num.Vector2(111, 148), imageIndex, DialogInterface.map.Metadata[imageIndex].Description);
167 }
168 else
169 {
170 Logging.Error("Portrait ImageMap not initialized.");
171 }
164
172
165 ImGui.NextColumn();
173 ImGui.NextColumn();
166
174
Show file before | Show file after | Show commentsHide comments
@@ -14,7 +14,6
14 {
14 {
15 public static bool hadFocus = false;
15 public static bool hadFocus = false;
16
16
17 private static bool enforceTresspassing1 = false;
18 private static string enforceTresspassing2 = "Unspecified";
17 private static string enforceTresspassing2 = "Unspecified";
19
18
20 public static void Render(ImFontPtr font, Simulation sim, ImGuiWindowBridgeEngine engine)
19 public static void Render(ImFontPtr font, Simulation sim, ImGuiWindowBridgeEngine engine)
You need to be logged in to leave comments. Login now