Little fixes

JarrettBillingsley · Nov 22, 2015 · f1f0702 · f1f0702
1 parent 5a94c9c
commit f1f0702
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/samples/imguitest.croc b/samples/imguitest.croc
@@ -260,7 +260,7 @@ function doEvents()
 				break
 
 			case "scroll":
-				imgui.io.setMouseWheel(b > 0 ? 1 : b < 0 ? -1 : 0)
+				imgui.io.setMouseWheel(b <=> 0)
 				break
 
 			case "key":

diff --git a/src/croc/addons/glfw.cpp b/src/croc/addons/glfw.cpp
@@ -996,7 +996,7 @@ while(not window.shouldClose())
 
 	\returns an event as specified in the docs for \link{pollEvents}.)"),
 
-	"waitEvents", 0
+	"waitEvents", 1 // 1 so it can be used as an "opApply"
 };
 
 word_t _waitEvents(CrocThread* t)

diff --git a/src/croc/ext/imgui/imgui.cpp b/src/croc/ext/imgui/imgui.cpp
@@ -5651,7 +5651,7 @@ ImVec2 ImBitmapFont::CalcTextSizeA(float size, float max_width, const char* text
     const char* s = text_begin;
     while (s < text_end)
     {
-        unsigned int c;
+        unsigned int c = 0;
         const int bytes_count = ImTextCharFromUtf8(&c, s, text_end);
         s += bytes_count > 0 ? bytes_count : 1;  // Handle decoding failure by skipping to next byte
 
@@ -5780,7 +5780,7 @@ void ImBitmapFont::RenderText(float size, ImVec2 pos, ImU32 col, const ImVec4& c
     float y = pos.y;
     for (const char* s = text_begin; s < text_end; )
     {
-        unsigned int c;
+        unsigned int c = 0;
         const int bytes_count = ImTextCharFromUtf8(&c, s, text_end);
         s += bytes_count > 0 ? bytes_count : 1;  // Handle decoding failure by skipping to next byte
         if (c >= 0x10000)