changeset 585:76ce31b0151f

misc: minor edits
author David Demelier <markand@malikania.fr>
date Sat, 18 Mar 2023 17:21:05 +0100
parents f2737a931658
children 4349b591c3ac
files libmlk-core/mlk/core/err.h libmlk-core/mlk/core/game.c libmlk-core/mlk/core/image.c libmlk-core/mlk/core/key.h libmlk-core/mlk/core/texture.c libmlk-core/mlk/core/texture.h libmlk-core/mlk/core/util.c libmlk-core/mlk/core/util.h libmlk-example/mlk/example/registry.c libmlk-rpg/mlk/rpg/message.c libmlk-ui/mlk/ui/gridmenu.c
diffstat 11 files changed, 25 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libmlk-core/mlk/core/err.h	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/err.h	Sat Mar 18 17:21:05 2023 +0100
@@ -19,8 +19,6 @@
 #ifndef MLK_ERR_H
 #define MLK_ERR_H
 
-#include <stdarg.h>
-
 /**
  * \file mlk/core/err.h
  * \brief Error handling
@@ -36,6 +34,12 @@
  * [errno]: https://en.cppreference.com/w/c/error/errno
  */
 
+#include <stdarg.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /**
  * Set the error using printf format string.
  *
@@ -57,7 +61,16 @@
 int
 mlk_errva(const char *fmt, va_list ap);
 
+/**
+ * Retrieve the last stored error as a string.
+ *
+ * \return the current error
+ */
 const char *
 mlk_err(void);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* !MLK_ERROR_H */
--- a/libmlk-core/mlk/core/game.c	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/game.c	Sat Mar 18 17:21:05 2023 +0100
@@ -126,7 +126,7 @@
 		 * a little to save CPU cycles.
 		 */
 		if ((elapsed = mlk_clock_elapsed(&clock)) < frametime)
-			mlk_util_delay(frametime - elapsed);
+			mlk_util_sleep(frametime - elapsed);
 
 		elapsed = mlk_clock_elapsed(&clock);
 
--- a/libmlk-core/mlk/core/image.c	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/image.c	Sat Mar 18 17:21:05 2023 +0100
@@ -20,6 +20,7 @@
 
 #include <SDL_image.h>
 
+#include "err.h"
 #include "texture.h"
 #include "window.h"
 #include "window_p.h"
--- a/libmlk-core/mlk/core/key.h	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/key.h	Sat Mar 18 17:21:05 2023 +0100
@@ -227,7 +227,7 @@
 	MLK_KEY_LBRACKET,
 
 	/**
-	 * Back slack (\).
+	 * Back slack (\\).
 	 */
 	MLK_KEY_BACKSLASH,
 
--- a/libmlk-core/mlk/core/texture.c	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/texture.c	Sat Mar 18 17:21:05 2023 +0100
@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include "color.h"
+#include "err.h"
 #include "texture.h"
 #include "texture_p.h"
 #include "util.h"
--- a/libmlk-core/mlk/core/texture.h	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/texture.h	Sat Mar 18 17:21:05 2023 +0100
@@ -24,8 +24,6 @@
  * \brief Basic texture management
  */
 
-#include "err.h"
-
 /**
  * \struct mlk_texture
  * \brief Texture structure
--- a/libmlk-core/mlk/core/util.c	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/util.c	Sat Mar 18 17:21:05 2023 +0100
@@ -27,7 +27,7 @@
 #include "util.h"
 
 void
-mlk_util_delay(unsigned int ms)
+mlk_util_sleep(unsigned int ms)
 {
 	SDL_Delay(ms);
 }
--- a/libmlk-core/mlk/core/util.h	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-core/mlk/core/util.h	Sat Mar 18 17:21:05 2023 +0100
@@ -42,7 +42,7 @@
  * \param duration time to sleep in milliseconds
  */
 void
-mlk_util_delay(unsigned int duration);
+mlk_util_sleep(unsigned int duration);
 
 /**
  * Convenient function to create an return a string to a filesystem path using
--- a/libmlk-example/mlk/example/registry.c	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-example/mlk/example/registry.c	Sat Mar 18 17:21:05 2023 +0100
@@ -18,10 +18,11 @@
 
 #include <stddef.h>
 
+#include <mlk/core/err.h>
 #include <mlk/core/image.h>
 #include <mlk/core/panic.h>
+#include <mlk/core/sys.h>
 #include <mlk/core/util.h>
-#include <mlk/core/sys.h>
 
 #include <assets/images/battle-background.h>
 #include <assets/images/black-cat.h>
--- a/libmlk-rpg/mlk/rpg/message.c	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/message.c	Sat Mar 18 17:21:05 2023 +0100
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <mlk/core/err.h>
 #include <mlk/core/event.h>
 #include <mlk/core/font.h>
 #include <mlk/core/maths.h>
--- a/libmlk-ui/mlk/ui/gridmenu.c	Sat Mar 18 10:57:29 2023 +0100
+++ b/libmlk-ui/mlk/ui/gridmenu.c	Sat Mar 18 17:21:05 2023 +0100
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <string.h>
 
+#include <mlk/core/err.h>
 #include <mlk/core/event.h>
 #include <mlk/core/font.h>
 #include <mlk/core/maths.h>