Description:
Fix a bunch of warnings.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -48,14 +48,12 | |||
|
48 | 48 | { |
|
49 | 49 | case ProfanityLevel.Uncensored: |
|
50 | 50 | return s; |
|
51 | break; | |
|
52 | 51 | case ProfanityLevel.Minced: |
|
53 | 52 | foreach (var item in replacements) |
|
54 | 53 | { |
|
55 | 54 | s = s.Replace(item.Key, item.Value); |
|
56 | 55 | } |
|
57 | 56 | return s; |
|
58 | break; | |
|
59 | 57 | case ProfanityLevel.Removed: |
|
60 | 58 | return Regex.Replace(s, "(?i)((?<=d)amn|(?<=f)uck|(?<=D)amn|(?<=F)uck)", "------"); |
|
61 | 59 | } |
@@ -40,7 +40,8 | |||
|
40 | 40 | EnforcementLevel.Unspecified => 0, |
|
41 | 41 | EnforcementLevel.NoEnforcement => 0, |
|
42 | 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 | 47 | SetComponent<BudgetLineComponent>(entity, |
@@ -64,8 +64,8 | |||
|
64 | 64 | } |
|
65 | 65 | |
|
66 | 66 | Debug.Assert(ImageMapTexture != null); |
|
67 | Debug.Assert(tileHeight != null); | |
|
68 | Debug.Assert(tileWidth != null); | |
|
67 | // Debug.Assert(tileHeight != null); | |
|
68 | // Debug.Assert(tileWidth != null); | |
|
69 | 69 | Logging.Info("Constructed ImageMap."); |
|
70 | 70 | |
|
71 | 71 |
@@ -120,7 +120,7 | |||
|
120 | 120 | |
|
121 | 121 | public static bool hadFocus = false; |
|
122 | 122 | |
|
123 | public static ImGuiImageMap map; | |
|
123 | public static ImGuiImageMap? map; | |
|
124 | 124 | private static IntPtr _imGuiTexture; |
|
125 | 125 | |
|
126 | 126 | public static void LoadContent(ImGuiRenderer _imGuiRenderer, |
@@ -157,10 +157,18 | |||
|
157 | 157 | ImGui.Columns(2); |
|
158 | 158 | ImGui.SetColumnWidth(0, 120); |
|
159 | 159 | |
|
160 | ||
|
161 | if (DialogInterface.map != null) | |
|
162 | { | |
|
160 | 163 | var metadata = DialogInterface.map.Metadata[imageIndex]; |
|
161 | 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 | 173 | ImGui.NextColumn(); |
|
166 | 174 |
You need to be logged in to leave comments.
Login now