[Quake2world-dev] r403 - quake2world/branches/menu/src/menu

[mattn at jdolan.dyndns.org]

Author: mattn
Date: 2009-04-19 20:54:48 +0000 (Sun, 19 Apr 2009)
New Revision: 403

Modified:
   quake2world/branches/menu/src/menu/scripts.h
Log:
* rearranged some stuff

Modified: quake2world/branches/menu/src/menu/scripts.h
===================================================================
--- quake2world/branches/menu/src/menu/scripts.h	2009-04-19 20:51:48 UTC (rev 402)
+++ quake2world/branches/menu/src/menu/scripts.h	2009-04-19 20:54:48 UTC (rev 403)
@@ -46,18 +46,6 @@
 #define mousePosX mouse_x
 #define mousePosY mouse_y
 
-#if defined _WIN32
-#	define Q_strcasecmp(a, b) _stricmp((a), (b))
-#else
-#	define Q_strcasecmp(a, b) strcasecmp((a), (b))
-#endif
-
-int Q_vsnprintf(char *str, size_t size, const char *format, va_list ap);
-void Q_strncpyz(char *dest, const char *src, size_t destsize);
-void Q_strcat(char *dest, const char *src, size_t destsize);
-void FS_SkipBlock(const char **text);
-const char *Com_MacroExpandString(const char *text);
-
 #ifndef ALIGN_PTR
 #define ALIGN_PTR(value,size) (void*)(((uintptr_t)value + (size - 1)) & (~(size - 1)))
 #endif
@@ -96,9 +84,10 @@
 } valueTypes_t;
 
 extern const char *const vt_names[];
+extern const char *const align_names[];
+extern const char *const longlines_names[];
 
 /** @brief We need this here for checking the boundaries from script values */
-
 typedef enum {
 	LONGLINES_WRAP,
 	LONGLINES_CHOP,
@@ -107,9 +96,6 @@
 	LONGLINES_LAST
 } longlines_t;
 
-extern const char *const align_names[];
-extern const char *const longlines_names[];
-
 /** used e.g. in our parsers */
 typedef struct value_s {
 	const char *string;
@@ -131,7 +117,18 @@
 void* Com_AlignPtr(void *memory, valueTypes_t type);
 const char *Com_ValueToStr(const void *base, const valueTypes_t type, const int ofs);
 int Com_ParseValue(void *base, const char *token, valueTypes_t type, int ofs, size_t size, size_t *writedByte);
+int Q_vsnprintf(char *str, size_t size, const char *format, va_list ap);
+void Q_strncpyz(char *dest, const char *src, size_t destsize);
+void Q_strcat(char *dest, const char *src, size_t destsize);
+void FS_SkipBlock(const char **text);
+const char *Com_MacroExpandString(const char *text);
 
+#if defined _WIN32
+#	define Q_strcasecmp(a, b) _stricmp((a), (b))
+#else
+#	define Q_strcasecmp(a, b) strcasecmp((a), (b))
+#endif
+
 #include "mem.h"
 
 #endif