~ Additional logging when using level.vertex_position (FOUND A FEW BAD BUGS IN SCRIPTS WITH THIS!)

~ Exported level.valid_vertex(number) | Use it before level.vertex_position especially!
- removed some verify for weapon params, allowing them to be zero, since Epsilon is set
~ CConsole::ExecuteCommand | line_edit::remove_spaces(edt) commented and replaced with _Trim(edt).

Author: revolucas

README.md

@@ -4,6 +4,8 @@
 This repository contains XRAY Engine sources based on version 1.6.02 for specific use with the Call of Chernobyl modification.
 The original engine is used in S.T.A.L.K.E.R. Call of Pripyat game released by GSC Game World and any changes to this engine are allowed for ***non-commercial*** use only (see [License.txt](https://github.com/avoitishin/xray-16/blob/master/License.txt) for details).
 
+The goal of this project is to expand the moddability and features of the engine; Fixing issues or bugs when necessary. It is not to reshape or rebuild X-Ray using modern technology.
+
 ## Build Instructions
 This project is maintained under Visual Studio 2013.
 You need https://developer.microsoft.com/en-us/windows/downloads/windows-8-1-sdk

src/Layers/xrRender/Light_DB.cpp

@@ -202,7 +202,7 @@ void			CLight_DB::Update			()
 		light*	_sun_original		= (light*) sun_original._get();
 		light*	_sun_adapted		= (light*) sun_adapted._get();
 		CEnvDescriptor&	E			= *g_pGamePersistent->Environment().CurrentEnv;
-		VERIFY						(_valid(E.sun_dir));
+		//VERIFY						(_valid(E.sun_dir));
 #ifdef DEBUG
 		if(E.sun_dir.y>=0)
 		{

src/xrEngine/IGame_ObjectPool.cpp

@@ -51,8 +51,14 @@ void IGame_ObjectPool::clear()
 
 CObject* IGame_ObjectPool::create(LPCSTR name)
 {
-    CLASS_ID CLS = pSettings->r_clsid(name, "class");
-    CObject* O = (CObject*)NEW_INSTANCE(CLS);
+	CLASS_ID CLS = pSettings->r_clsid(name, "class");
+	CObject* O = (CObject*)NEW_INSTANCE(CLS);
+	if (!O)
+	{
+		LogStackTrace("");
+		Msg("xrFactory_Create | failed to create %s by clsid %d", name, CLS);
+		return (0);
+	}
     O->cNameSect_set(name);
     O->Load(name);
     return O;

src/xrEngine/XR_IOConsole.cpp

@@ -579,7 +579,9 @@ void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd)
     reset_cmd_history_idx();
     reset_selected_tip();
 
-    text_editor::remove_spaces(edt);
+    //text_editor::remove_spaces(edt);
+	_Trim(edt);
+
     if (edt[0] == 0)
     {
         return;

src/xrGame/Level_network_spawn.cpp

@@ -112,7 +112,10 @@ void CLevel::g_sv_Spawn		(CSE_Abstract* E)
 #ifdef DEBUG_MEMORY_MANAGER
 	mem_alloc_gather_stats		(false);
 #endif // DEBUG_MEMORY_MANAGER
-	if (0==O || (!O->net_Spawn	(E))) 
+	if (O == 0)
+	{
+		Msg("! Failed to spawn entity '%s'", *E->s_name);
+	}else if (!O->net_Spawn(E)) 
 	{
 		O->net_Destroy			( );
 		if(!g_dedicated_server)

src/xrGame/ShootingObject.cpp

@@ -68,11 +68,10 @@ void CShootingObject::Load	(LPCSTR section)
 
 	//âðåìÿ çàòðà÷èâàåìîå íà âûñòðåë
 	fOneShotTime			= pSettings->r_float		(section,"rpm");
-
+	if(fis_zero(fOneShotTime))
+		fOneShotTime = EPS;
 	//Alundaio: Two-shot burst rpm; used for Abakan/AN-94
 	fModeShotTime = READ_IF_EXISTS(pSettings, r_float, section, "rpm_mode_2", fOneShotTime);
-
-	VERIFY(fOneShotTime>0.f);
 	fOneShotTime = 60.f / fOneShotTime;
 	fModeShotTime = 60.f / fModeShotTime;
 

src/xrGame/Weapon.cpp

@@ -260,9 +260,7 @@ void CWeapon::Load(LPCSTR section)
     float temp_f = 0.0f;
     temp_f = pSettings->r_float(section, "cam_relax_speed");
     cam_recoil.RelaxSpeed = _abs(deg2rad(temp_f));
-    //AVO: commented out as very minor and is clashing with weapon mods
-    //UNDONE after non fatal VERIFY implementation
-    VERIFY(!fis_zero(cam_recoil.RelaxSpeed));
+	//VERIFY(!fis_zero(cam_recoil.RelaxSpeed));
     if (fis_zero(cam_recoil.RelaxSpeed))
     {
         cam_recoil.RelaxSpeed = EPS_L;
@@ -281,15 +279,15 @@ void CWeapon::Load(LPCSTR section)
     }
     temp_f = pSettings->r_float(section, "cam_max_angle");
     cam_recoil.MaxAngleVert = _abs(deg2rad(temp_f));
-    VERIFY(!fis_zero(cam_recoil.MaxAngleVert));
+	//VERIFY(!fis_zero(cam_recoil.MaxAngleVert));
     if (fis_zero(cam_recoil.MaxAngleVert))
     {
         cam_recoil.MaxAngleVert = EPS;
     }
 
     temp_f = pSettings->r_float(section, "cam_max_angle_horz");
     cam_recoil.MaxAngleHorz = _abs(deg2rad(temp_f));
-    VERIFY(!fis_zero(cam_recoil.MaxAngleHorz));
+    //VERIFY(!fis_zero(cam_recoil.MaxAngleHorz));
     if (fis_zero(cam_recoil.MaxAngleHorz))
     {
         cam_recoil.MaxAngleHorz = EPS;

src/xrGame/level_script.cpp

@@ -255,9 +255,19 @@ u32	vertex_in_direction(u32 level_vertex_id, Fvector direction, float max_distan
 
 Fvector vertex_position(u32 level_vertex_id)
 {
+	if (!ai().level_graph().valid_vertex_id(level_vertex_id))
+	{
+		ai().script_engine().print_stack();
+		Msg("level.vertex_position | Invalid vertex id %d", level_vertex_id);
+	}
 	return			(ai().level_graph().vertex_position(level_vertex_id));
 }
 
+bool valid_vertex(u32 level_vertex_id)
+{
+	return ai().level_graph().valid_vertex_id(level_vertex_id);
+}
+
 void map_add_object_spot(u16 id, LPCSTR spot_type, LPCSTR text)
 {
 	CMapLocation* ml = Level().MapManager().AddMapLocation(spot_type,id);
@@ -831,6 +841,7 @@ void CLevel::script_register(lua_State *L)
 		def("get_active_cam", &get_active_cam),
 		def("set_active_cam", &set_active_cam),
 		def("get_start_time", &get_start_time),
+		def("valid_vertex", &valid_vertex),
 #endif
 		//Alundaio: END
 		// obsolete\deprecated

src/xrGame/xrGame.cpp

@@ -29,10 +29,10 @@ extern "C" {
 	DLL_API DLL_Pure*	__cdecl xrFactory_Create		(CLASS_ID clsid)
 	{
 		DLL_Pure			*object = object_factory().client_object(clsid);
-#ifdef DEBUG
+//#ifdef DEBUG
 		if (!object)
-			return			(0);
-#endif
+			return (0);
+//#endif
 		object->CLS_ID		= clsid;
 		return				(object);
 	}