From 565b39e5d6a567305b677ad847549e2fee63d12d Mon Sep 17 00:00:00 2001
From: Andrey Voitishin <a.voitishin@gmail.com>
Date: Tue, 30 Dec 2014 09:04:45 -0500
Subject: [PATCH] + exported is_* (is_stalker, etc.) methods + exported
 additional methods for ini_file class to allow writing * changed w_vector2
 and w vector to w_fvector2 and w_fvector3

---
 src/xrGame/script_game_object.h               |  40 +++
 src/xrGame/script_game_object4.cpp            | 296 ++++++++++++++++++
 src/xrGame/script_game_object_script3.cpp     |  40 +++
 src/xrServerEntities/script_ini_file.cpp      | 144 ++++++++-
 src/xrServerEntities/script_ini_file.h        |  23 ++
 .../script_ini_file_script.cpp                |   9 +-
 6 files changed, 547 insertions(+), 5 deletions(-)

diff --git a/src/xrGame/script_game_object.h b/src/xrGame/script_game_object.h
index 0ff1c180cda..55bee408c18 100644
--- a/src/xrGame/script_game_object.h
+++ b/src/xrGame/script_game_object.h
@@ -779,6 +779,46 @@ class CScriptGameObject
     bool is_door_blocked_by_npc() const;
     bool is_weapon_going_to_be_strapped(CScriptGameObject const* object) const;
 
+    //AVO: functions for object testing
+    bool isGameObject() const;
+    //bool isCar() const;
+    bool isHeli() const;
+    //bool isHolderCustom() const;
+    bool isEntityAlive() const;
+    bool isInventoryItem() const;
+    bool isInventoryOwner() const;
+    bool isActor() const;
+    bool isCustomMonster() const;
+    bool isWeapon() const;
+    bool isMedkit() const;
+    bool isEatableItem() const;
+    bool isAntirad() const;
+    bool isCustomOutfit() const;
+    bool isScope() const;
+    bool isSilencer() const;
+    bool isGrenadeLauncher() const;
+    bool isWeaponMagazined() const;
+    bool isSpaceRestrictor() const;
+    bool isStalker() const;
+    bool isAnomaly() const;
+    bool isMonster() const;
+    bool isExplosive() const;
+    bool isScriptZone() const;
+    bool isProjector() const;
+    bool isTrader() const;
+    bool isHudItem() const;
+    bool isFoodItem() const;
+    bool isArtefact() const;
+    bool isAmmo() const;
+    bool isMissile() const;
+    bool isPhysicsShellHolder() const;
+    bool isGrenade() const;
+    bool isBottleItem() const;
+    bool isTorch() const;
+    bool isWeaponGL() const;
+    bool isInventoryBox() const;
+    //end AVO
+
     doors::door* m_door;
 };
 
diff --git a/src/xrGame/script_game_object4.cpp b/src/xrGame/script_game_object4.cpp
index 66a2f1b9846..7f6d8725cdc 100644
--- a/src/xrGame/script_game_object4.cpp
+++ b/src/xrGame/script_game_object4.cpp
@@ -367,3 +367,299 @@ void CScriptGameObject::stop_particles(LPCSTR pname, LPCSTR bone)
         ai().script_engine().script_log(
             LuaMessageType::Error, "Cant stop particles, bone [%s] is not visible now", bone);
 }
+
+// AVO: functions for testing object class
+// Credits: KD
+//#include "Car.h"
+#include "helicopter.h"
+#include "Actor.h"
+#include "CustomOutfit.h"
+//#include "CustomZone.h"
+#include "ai\Monsters\BaseMonster\base_monster.h"
+#include "medkit.h"
+#include "antirad.h"
+#include "Scope.h"
+#include "Silencer.h"
+#include "Torch.h"
+#include "GrenadeLauncher.h"
+#include "searchlight.h"
+//#include "WeaponAmmo.h"
+#include "Grenade.h"
+#include "BottleItem.h"
+#include "WeaponMagazinedWGrenade.h"
+
+// Xottab_DUTY: commented this macro, because of substituting it
+/*
+#define TEST_OBJECT_CLASS(A, B)\
+bool A() const\
+{\
+    auto l_tpEntity = smart_cast<B*>(&object());\
+    if (!l_tpEntity)\
+        return false;\
+    return true;\
+}\
+*/
+
+bool CScriptGameObject::isGameObject() const
+{
+    auto l_tpEntity = smart_cast<CGameObject*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+/*
+bool CScriptGameObject::isCar() const
+{
+    auto l_tpEntity = smart_cast<CCar*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+*/
+
+bool CScriptGameObject::isHeli() const
+{
+    auto l_tpEntity = smart_cast<CHelicopter*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+/*
+bool CScriptGameObject::isHolderCustom() const
+{
+    auto l_tpEntity = smart_cast<CHolderCustom*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+*/
+
+bool CScriptGameObject::isEntityAlive() const
+{
+    auto l_tpEntity = smart_cast<CEntityAlive*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isInventoryItem() const
+{
+    auto l_tpEntity = smart_cast<CInventoryItem*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isInventoryOwner() const
+{
+    auto l_tpEntity = smart_cast<CInventoryOwner*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isActor() const
+{
+    auto l_tpEntity = smart_cast<CActor*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isCustomMonster() const
+{
+    auto l_tpEntity = smart_cast<CCustomMonster*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isWeapon() const
+{
+    auto l_tpEntity = smart_cast<CWeapon*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isMedkit() const
+{
+    auto l_tpEntity = smart_cast<CMedkit*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isEatableItem() const
+{
+    auto l_tpEntity = smart_cast<CEatableItem*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isAntirad() const
+{
+    auto l_tpEntity = smart_cast<CAntirad*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isCustomOutfit() const
+{
+    auto l_tpEntity = smart_cast<CCustomOutfit*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isScope() const
+{
+    auto l_tpEntity = smart_cast<CScope*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isSilencer() const
+{
+    auto l_tpEntity = smart_cast<CSilencer*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isGrenadeLauncher() const
+{
+    auto l_tpEntity = smart_cast<CGrenadeLauncher*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isWeaponMagazined() const
+{
+    auto l_tpEntity = smart_cast<CWeaponMagazined*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isSpaceRestrictor() const
+{
+    auto l_tpEntity = smart_cast<CSpaceRestrictor*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isStalker() const
+{
+    auto l_tpEntity = smart_cast<CAI_Stalker*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isAnomaly() const
+{
+    auto l_tpEntity = smart_cast<CCustomZone*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isMonster() const
+{
+    auto l_tpEntity = smart_cast<CBaseMonster*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isExplosive() const
+{
+    auto l_tpEntity = smart_cast<CExplosive*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isScriptZone() const
+{
+    auto l_tpEntity = smart_cast<CScriptZone*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isProjector() const
+{
+    auto l_tpEntity = smart_cast<CProjector*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isTrader() const
+{
+    auto l_tpEntity = smart_cast<CAI_Trader*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isHudItem() const
+{
+    auto l_tpEntity = smart_cast<CHudItem*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isFoodItem() const
+{
+    auto l_tpEntity = smart_cast<CFoodItem*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isArtefact() const
+{
+    auto l_tpEntity = smart_cast<CArtefact*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isAmmo() const
+{
+    auto l_tpEntity = smart_cast<CWeaponAmmo*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isMissile() const
+{
+    auto l_tpEntity = smart_cast<CMissile*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isPhysicsShellHolder() const
+{
+    auto l_tpEntity = smart_cast<CPhysicsShellHolder*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isGrenade() const
+{
+    auto l_tpEntity = smart_cast<CGrenade*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isBottleItem() const
+{
+    auto l_tpEntity = smart_cast<CBottleItem*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isTorch() const
+{
+    auto l_tpEntity = smart_cast<CTorch*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isWeaponGL() const
+{
+    auto l_tpEntity = smart_cast<CWeaponMagazinedWGrenade*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+
+bool CScriptGameObject::isInventoryBox() const
+{
+    auto l_tpEntity = smart_cast<CInventoryBox*>(&object());
+    if (!l_tpEntity) return false;
+    return true;
+}
+//end AVO
diff --git a/src/xrGame/script_game_object_script3.cpp b/src/xrGame/script_game_object_script3.cpp
index 1f540c5c68d..0ca1e277346 100644
--- a/src/xrGame/script_game_object_script3.cpp
+++ b/src/xrGame/script_game_object_script3.cpp
@@ -341,6 +341,46 @@ class_<CScriptGameObject>& script_register_game_object2(class_<CScriptGameObject
         .def("start_particles", &CScriptGameObject::start_particles)
         .def("stop_particles", &CScriptGameObject::stop_particles)
 
+        //AVO: functions for object testing
+        .def("is_game_object", &CScriptGameObject::isGameObject)
+        //.def("is_car", &CScriptGameObject::isCar)
+        .def("is_helicopter", &CScriptGameObject::isHeli)
+        //.def("is_holder", &CScriptGameObject::isHolderCustom)
+        .def("is_entity_alive", &CScriptGameObject::isEntityAlive)
+        .def("is_inventory_item", &CScriptGameObject::isInventoryItem)
+        .def("is_inventory_owner", &CScriptGameObject::isInventoryOwner)
+        .def("is_actor", &CScriptGameObject::isActor)
+        .def("is_custom_monster", &CScriptGameObject::isCustomMonster)
+        .def("is_weapon", &CScriptGameObject::isWeapon)
+        .def("is_medkit", &CScriptGameObject::isMedkit)
+        .def("is_eatable_item", &CScriptGameObject::isEatableItem)
+        .def("is_antirad", &CScriptGameObject::isAntirad)
+        .def("is_outfit", &CScriptGameObject::isCustomOutfit)
+        .def("is_scope", &CScriptGameObject::isScope)
+        .def("is_silencer", &CScriptGameObject::isSilencer)
+        .def("is_grenade_launcher", &CScriptGameObject::isGrenadeLauncher)
+        .def("is_weapon_magazined", &CScriptGameObject::isWeaponMagazined)
+        .def("is_space_restrictor", &CScriptGameObject::isSpaceRestrictor)
+        .def("is_stalker", &CScriptGameObject::isStalker)
+        .def("is_anomaly", &CScriptGameObject::isAnomaly)
+        .def("is_monster", &CScriptGameObject::isMonster)
+        .def("is_explosive", &CScriptGameObject::isExplosive)
+        .def("is_script_zone", &CScriptGameObject::isScriptZone)
+        .def("is_projector", &CScriptGameObject::isProjector)
+        .def("is_trader", &CScriptGameObject::isTrader)
+        .def("is_hud_item", &CScriptGameObject::isHudItem)
+        .def("is_food_item", &CScriptGameObject::isFoodItem)
+        .def("is_artefact", &CScriptGameObject::isArtefact)
+        .def("is_ammo", &CScriptGameObject::isAmmo)
+        .def("is_missile", &CScriptGameObject::isMissile)
+        .def("is_physics_shell_holder", &CScriptGameObject::isPhysicsShellHolder)
+        .def("is_grenade", &CScriptGameObject::isGrenade)
+        .def("is_bottle_item", &CScriptGameObject::isBottleItem)
+        .def("is_torch", &CScriptGameObject::isTorch)
+        .def("is_weapon_gl", &CScriptGameObject::isWeaponGL)
+        .def("is_inventory_box", &CScriptGameObject::isInventoryBox)
+        //end AVO
+
         ;
     return (instance);
 }
diff --git a/src/xrServerEntities/script_ini_file.cpp b/src/xrServerEntities/script_ini_file.cpp
index f1bf11b03d2..786c05967e1 100644
--- a/src/xrServerEntities/script_ini_file.cpp
+++ b/src/xrServerEntities/script_ini_file.cpp
@@ -16,8 +16,7 @@
 CScriptIniFile::CScriptIniFile(IReader* F, LPCSTR path) : inherited(F, path) {}
 CScriptIniFile::CScriptIniFile(LPCSTR szFileName, BOOL ReadOnly, BOOL bLoadAtStart, BOOL SaveAtEnd)
     : inherited(update(szFileName), ReadOnly, bLoadAtStart, SaveAtEnd)
-{
-}
+{}
 
 CScriptIniFile::~CScriptIniFile() {}
 LPCSTR CScriptIniFile::update(LPCSTR file_name)
@@ -77,3 +76,144 @@ Fvector CScriptIniFile::r_fvector3(LPCSTR S, LPCSTR L)
     VERIFY3(inherited::line_exist(S, L), "Cannot find line", L);
     return inherited::r_fvector3(S, L);
 }
+
+//AVO: additional methods to allow writing to ini files
+void CScriptIniFile::w_bool(pcstr S, pcstr L, bool V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_bool(S, L, V, comment);
+}
+
+void CScriptIniFile::w_color(pcstr S, pcstr L, u32 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_color(S, L, V, comment);
+}
+
+void CScriptIniFile::w_fcolor(pcstr S, pcstr L, const Fcolor& V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_fcolor(S, L, V, comment);
+}
+
+void CScriptIniFile::w_float(pcstr S, pcstr L, float V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_float(S, L, V, comment);
+}
+
+void CScriptIniFile::w_fvector2(pcstr S, pcstr L, const Fvector2& V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_fvector2(S, L, V, comment);
+}
+
+void CScriptIniFile::w_fvector3(pcstr S, pcstr L, const Fvector3& V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_fvector3(S, L, V, comment);
+}
+
+void CScriptIniFile::w_fvector4(pcstr S, pcstr L, const Fvector4& V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_fvector4(S, L, V, comment);
+}
+
+void CScriptIniFile::w_s16(pcstr S, pcstr L, s16 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_s16(S, L, V, comment);
+}
+
+void CScriptIniFile::w_s32(pcstr S, pcstr L, s32 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_s32(S, L, V, comment);
+}
+
+void CScriptIniFile::w_s64(pcstr S, pcstr L, s64 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_s64(S, L, V, comment);
+}
+
+void CScriptIniFile::w_s8(pcstr S, pcstr L, s8 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_s8(S, L, V, comment);
+}
+
+void CScriptIniFile::w_string(pcstr S, pcstr L, pcstr V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_string(S, L, V, comment);
+}
+
+void CScriptIniFile::w_u16(pcstr S, pcstr L, u16 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_u16(S, L, V, comment);
+}
+
+void CScriptIniFile::w_u32(pcstr S, pcstr L, u32 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_u32(S, L, V, comment);
+}
+
+void CScriptIniFile::w_u64(pcstr S, pcstr L, u64 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_u64(S, L, V, comment);
+}
+
+void CScriptIniFile::w_u8(pcstr S, pcstr L, u8 V, pcstr comment)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::w_u8(S, L, V, comment);
+}
+
+bool CScriptIniFile::save_as(pcstr new_fname)
+{
+    THROW2(new_fname, "File name is null");
+    return(inherited::save_as(new_fname));
+}
+
+void CScriptIniFile::save_at_end(bool b)
+{
+    inherited::save_at_end(b);
+}
+
+void CScriptIniFile::remove_line(pcstr S, pcstr L)
+{
+    THROW3(inherited::section_exist(S), "Cannot find section", S);
+    THROW3(inherited::line_exist(S, L), "Cannot find line", L);
+    inherited::remove_line(S, L);
+}
+
+void CScriptIniFile::set_override_names(bool b)
+{
+    inherited::set_override_names(b);
+}
+
+u32 CScriptIniFile::section_count()
+{
+    return(inherited::section_count());
+}
diff --git a/src/xrServerEntities/script_ini_file.h b/src/xrServerEntities/script_ini_file.h
index 23fddc4e5ea..47fbc8d500f 100644
--- a/src/xrServerEntities/script_ini_file.h
+++ b/src/xrServerEntities/script_ini_file.h
@@ -32,6 +32,29 @@ class CScriptIniFile : public CInifile
     int r_s32(LPCSTR S, LPCSTR L);
     float r_float(LPCSTR S, LPCSTR L);
     Fvector r_fvector3(LPCSTR S, LPCSTR L);
+
+    //AVO: additional methods to allow writing to ini files
+    void w_bool(pcstr S, pcstr L, bool V, pcstr comment /* = nullptr */);
+    void w_color(pcstr S, pcstr L, u32 V, pcstr comment /* = nullptr */);
+    void w_fcolor(pcstr S, pcstr L, const Fcolor& V, pcstr comment /* = nullptr */);
+    void w_float(pcstr S, pcstr L, float V, pcstr comment /* = nullptr */);
+    void w_fvector2(pcstr S, pcstr L, const Fvector2& V, pcstr comment /* = nullptr */);
+    void w_fvector3(pcstr S, pcstr L, const Fvector3& V, pcstr comment /* = nullptr */);
+    void w_fvector4(pcstr S, pcstr L, const Fvector4& V, pcstr comment /* = nullptr */);
+    void w_s16(pcstr S, pcstr L, s16 V, pcstr comment /* = nullptr */);
+    void w_s32(pcstr S, pcstr L, s32 V, pcstr comment /* = nullptr */);
+    void w_s64(pcstr S, pcstr L, s64 V, pcstr comment /* = nullptr */);
+    void w_s8(pcstr S, pcstr L, s8 V, pcstr comment /* = nullptr */);
+    void w_string(pcstr S, pcstr L, pcstr V, pcstr comment /* = nullptr */);
+    void w_u16(pcstr S, pcstr L, u16 V, pcstr comment /* = nullptr */);
+    void w_u32(pcstr S, pcstr L, u32 V, pcstr comment /* = nullptr */);
+    void w_u64(pcstr S, pcstr L, u64 V, pcstr comment /* = nullptr */);
+    void w_u8(pcstr S, pcstr L, u8 V, pcstr comment /* = nullptr */);
+    bool save_as(pcstr new_fname /* = nullptr */);
+    void save_at_end(bool b);
+    void remove_line(pcstr S, pcstr L);
+    void set_override_names(bool b);
+    u32 section_count();
 };
 
 #include "script_ini_file_inline.h"
diff --git a/src/xrServerEntities/script_ini_file_script.cpp b/src/xrServerEntities/script_ini_file_script.cpp
index 7de8d207b0e..def72ee9360 100644
--- a/src/xrServerEntities/script_ini_file_script.cpp
+++ b/src/xrServerEntities/script_ini_file_script.cpp
@@ -68,8 +68,9 @@ static void CScriptIniFile_Export(lua_State* luaState)
             .def("w_color", &CScriptIniFile::w_color)
             .def("w_fcolor", &CScriptIniFile::w_fcolor)
             .def("w_float", &CScriptIniFile::w_float)
-            .def("w_vector2", &CScriptIniFile::w_fvector2)
-            .def("w_vector", &CScriptIniFile::w_fvector3)
+            .def("w_fvector2", &CScriptIniFile::w_fvector2)
+            .def("w_fvector3", &CScriptIniFile::w_fvector3)
+            .def("w_fvector4", &CScriptIniFile::w_fvector4)
             .def("w_s16", &CScriptIniFile::w_s16)
             .def("w_s32", &CScriptIniFile::w_s32)
             .def("w_s64", &CScriptIniFile::w_s64)
@@ -79,9 +80,11 @@ static void CScriptIniFile_Export(lua_State* luaState)
             .def("w_u32", &CScriptIniFile::w_u32)
             .def("w_u64", &CScriptIniFile::w_u64)
             .def("w_u8", &CScriptIniFile::w_u8)
-            .def("save_as", (bool (CScriptIniFile::*)(LPCSTR))(&CScriptIniFile::save_as))
+            .def("save_as", &CScriptIniFile::save_as)
             .def("save_at_end", &CScriptIniFile::save_at_end)
             .def("remove_line", &CScriptIniFile::remove_line)
+            .def("set_override_names", &CScriptIniFile::set_override_names)
+            .def("section_count", &CScriptIniFile::section_count)
             //Alundaio: END
             .def("section_exist", &CScriptIniFile::section_exist)
             .def("line_exist", (bool (CScriptIniFile::*)(LPCSTR, LPCSTR) const)&CScriptIniFile::line_exist)