mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 08:52:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix w4 warnings

Browse Source 
- add convenience macros for config_db(CFG_GET_SYS_VAL)
- VFSUtil::EnumDirEnts now uses flags instead of bool recursive
- UNUSED() for params, UNUSED2 (<- need better name) for variables
- config.h defines must be tested with #if (always defined) -> allows
detecting misspellings thanks to compiler warnings
- replace debug_assert(0) with debug_warn (its sole purpose)
- replace ScriptingHost::ValueToInt et al with ToPrimitive
- use nommgr.h to disable both mmgr and VC debug heap

This was SVN commit r2585.
This commit is contained in:
janwas
2005-08-09 15:55:44 +00:00
parent 630b375f4d
commit a69ac0dee9
115 changed files with 654 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/i18n/ScriptInterface.cpp
+5 -3
View File
@@ -69,7 +69,7 @@ namespace JSI_LookedupWord {
namespace JSI_i18n {
#define TYPE(x) \
static JSBool Create_##x(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) \
static JSBool Create_##x(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval) \
{ \
/* Set *rval = { type => "Name", value => argv[0] } */ \
\
@@ -77,6 +77,7 @@ namespace JSI_i18n {
JS_ASSERT(object, "Failed to create i18n value object"); \
\
/* TODO: More error checking */ \
JS_ASSERT(argc == 1, "Create_" #x ": not enough params"); \
jsval type = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, #x)); \
jsval value = STRING_TO_JSVAL(JS_ValueToString(cx, argv[0])); \
JS_SetProperty(cx, object, "type", &type); \
@@ -164,6 +165,7 @@ static JSBool JSFunc_Translate(JSContext *cx, JSObject *obj, uintN argc, jsval *
jsval locale_objval;
JS_ASSERT(JS_GetProperty(cx, obj, "i18n", &locale_objval), "translate() failed to find i18n object in current scope");
JSObject* locale_obj = JSVAL_TO_OBJECT(locale_objval);
UNUSED2(locale_obj);
CLocale* locale = (CLocale*)JS_GetPrivate(cx, JSVAL_TO_OBJECT(locale_objval));
StringBuffer sb = locale->Translate(phrase.c_str());
@@ -364,7 +366,7 @@ ScriptValueString::ScriptValueString(ScriptObject& script, const wchar_t* s)
}
}
jsval ScriptValueString::GetJsval(const std::vector<BufferVariable*>& vars)
jsval ScriptValueString::GetJsval(const std::vector<BufferVariable*>& UNUSED(vars))
{
return Value;
}
@@ -386,7 +388,7 @@ ScriptValueInteger::ScriptValueInteger(ScriptObject& script, const int v)
Value = INT_TO_JSVAL(v);
}
jsval ScriptValueInteger::GetJsval(const std::vector<BufferVariable*>& vars)
jsval ScriptValueInteger::GetJsval(const std::vector<BufferVariable*>& UNUSED(vars))
{
return Value;
}