Changeset 445 for Daodan/src

Timestamp:

Jul 19, 2009, 1:03:44 PM (15 years ago)

Author:

rossy

Message:

fixed sprintf

Location:

Daodan/src

Files:

• BFW_ScriptLang.h (added)
• BFW_ScriptingLanguage.h (deleted)
• Daodan.c (modified) (3 diffs)
• Daodan_BSL.c (modified) (10 diffs)

Daodan/src/Daodan.c

@@ -169 +169 @@
 }
 
-enum {s_unknown, s_options, s_patch, s_language} ini_section;
+enum {s_unknown, s_options, s_patch, s_bsl, s_language} ini_section;
 
 bool DDrIniCallback(char* section, bool newsection, char* name, char* value)
@@ -179 +179 @@
                 else if (!stricmp(section, "patch"))
                         ini_section = s_patch;
+                else if (!stricmp(section, "bsl"))
+                        ini_section = s_bsl;
                 else if (!stricmp(section, "language"))
                         ini_section = s_language;
@@ -241 +243 @@
                         else
                                 DDrStartupMessage("unrecognised patch \"%s\"", name);
+                        break;
+                case s_bsl:
+                        
                         break;
                 case s_language:

Daodan/src/Daodan_BSL.c

@@ -6 +6 @@
 #include "Daodan_Utility.h"
 #include "Daodan_Console.h"
-#include "BFW_ScriptingLanguage.h"
+#include "BFW_ScriptLang.h"
 #include "Oni.h"
 #include "Oni_Character.h"
@@ -13 +13 @@
 uint16_t ONICALL bsl_int32mul(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
 {
-        if (numargs < 2)
-                return 1;
         ret->value_int32 = args[0].value_int32 * args[1].value_int32;
         ret->type = sl_int32;
@@ -22 +20 @@
 uint16_t ONICALL bsl_mul(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
 {
-        if (numargs < 2)
-                return 1;
-        
         double val1;
         double val2;
@@ -45 +40 @@
 uint16_t ONICALL bsl_int32div(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
 {
-        if (numargs < 2)
-                return 1;
         ret->value_int32 = args[0].value_int32 / args[1].value_int32;
         ret->type = sl_int32;
@@ -54 +47 @@
 uint16_t ONICALL bsl_div(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
 {
-        if (numargs < 2)
-                return 1;
-        
         double val1;
         double val2;
@@ -77 +67 @@
 uint16_t ONICALL bsl_int32rand(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
 {
-        if (numargs < 2)
-                return 1;
-        
         int32_t start = 0;
         int32_t end = 0;
@@ -127 +114 @@
         if (numargs < 2)
                 return 1;
-
+        
         char output[255];
         int i;
@@ -141 +128 @@
 uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
 {
+        DDrConsole_PrintF("%d", numargs);
+        
+        if (numargs < 1 || args[0].type != sl_str32)
+        {
+                DDrConsole_PrintF("Func \"%s\", File \"%s\", Line %d: semantic error, \"%s\": parameter list does not match: format:string arg1 arg2 ...", callinfo->name, callinfo->calllocation, callinfo->linenumber, callinfo->name);
+                return 0;
+        }
+        
+        if (!args[0].value_str32)
+                args[0].value_str32 = "";
+        
         int ffi_ret;
         char* str = NULL;
@@ -174 +172 @@
         
         if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, i, &ffi_type_sint32, ffi_args) != FFI_OK)
-                MessageBox(0, "", "", 0);
+                return 1;
         ffi_call(&cif, (void*)snprintf, (void*)&ffi_ret, values);
         str = malloc(ffi_ret + 1);
@@ -198 +196 @@
         SLrScript_Command_Register_ReturnType("chr_getdamage","Gets the amount of damage a character has caused", "[chrindex:int]", sl_int32, bsl_getdamage);
         
-        SLrScript_Command_Register_ReturnType("sprintf", "C-style sprintf.", "str1:format", sl_str32, bsl_sprintf);
+        SLrScript_Command_Register_ReturnType("sprintf", "C-style sprintf.", "format:string arg1 arg2 ...", sl_str32, bsl_sprintf);
 }