From 3dd401c3b208d46b0a9973077662ab8a8242724b Mon Sep 17 00:00:00 2001 From: Igor Novikov Date: Mon, 1 Jan 2018 21:54:20 +0500 Subject: [PATCH] WIP of xrAI and xrSE_Factory. Delete unused files. --- src/utils/xrAI/spawn_patcher.cpp | 187 ---------------------------- src/utils/xrAI/spawn_patcher.h | 27 ---- src/utils/xrAI/xrAI.vcxproj | 2 - src/utils/xrAI/xrAI.vcxproj.filters | 9 -- 4 files changed, 225 deletions(-) delete mode 100644 src/utils/xrAI/spawn_patcher.cpp delete mode 100644 src/utils/xrAI/spawn_patcher.h diff --git a/src/utils/xrAI/spawn_patcher.cpp b/src/utils/xrAI/spawn_patcher.cpp deleted file mode 100644 index c374b19aa6c..00000000000 --- a/src/utils/xrAI/spawn_patcher.cpp +++ /dev/null @@ -1,187 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// Module : spawn_patcher.cpp -// Created : 12.06.2007 -// Modified : 12.06.2007 -// Author : Dmitriy Iassenev -// Description : spawn patcher class -//////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" - -#if 0 -#include "spawn_patcher.h" -#include "game_graph.h" -#include "game_spawn_constructor.h" -#include "patrol_path_storage.h" - -struct reader_guard { - IReader *m_reader; - - IC reader_guard (IReader *reader) : - m_reader (reader) - { - } - - IC ~reader_guard () - { - FS.r_close (m_reader); - } -}; - -spawn_patcher::spawn_patcher (LPCSTR new_spawn_id, LPCSTR previous_spawn_id) -{ - xrGUID previous_spawn_guid; - if (!spawn_guid(previous_spawn_id,previous_spawn_guid)) - return; - - string_path file_name; - if (!FS.exist(file_name, "$game_spawn$", new_spawn_id, ".spawn")) { - Msg ("cannot open spawn file \"%s\"",file_name); - return; - } - - CMemoryWriter writer; - - IReader *reader = FS.r_open(file_name); - reader_guard __guard(reader); - - if (!process_header(*reader,writer,previous_spawn_guid)) - return; - - if (!process_spawns(*reader,writer)) - return; - - if (!process_level(*reader,writer)) - return; - - if (!process_patrol(*reader,writer)) - return; - - writer.save_to (file_name); -} - -bool spawn_patcher::spawn_guid (LPCSTR spawn_id, xrGUID &result) -{ - string_path file_name; - if (!FS.exist(file_name, "$game_spawn$", spawn_id, ".spawn")) { - Msg ("cannot open spawn file \"%s\"",file_name); - return (false); - } - - IReader *reader = FS.r_open(file_name); - if (!reader) { - Msg ("Cannot open file \"%s\"",file_name); - return (false); - } - reader_guard __guard(reader); - - IReader *chunk = reader->open_chunk(0); - if (!chunk) { - Msg ("Spawn [%s] is broken: cannot find header chunk",file_name); - return (false); - } - - chunk->r_u32 (); - chunk->r (&result,sizeof(result)); - chunk->close (); - - return (true); -} - -bool spawn_patcher::process_header (IReader &reader, IWriter &writer, xrGUID &previous_spawn_guid) -{ - IReader *chunk = reader.open_chunk(0); - if (!chunk) { - Msg ("spawn is broken: cannot find header chunk"); - return (false); - } - - typedef CGameSpawnConstructor::CSpawnHeader CSpawnHeader; - CSpawnHeader header; - header.m_version = chunk->r_u32(); - chunk->r (&header.m_guid,sizeof(header.m_guid)); - chunk->r (&header.m_graph_guid,sizeof(header.m_graph_guid)); - header.m_spawn_count = chunk->r_u32(); - header.m_level_count = chunk->r_u32(); - - chunk->close (); - - header.m_guid = previous_spawn_guid; - - string256 game_graph_name; - FS.update_path (game_graph_name,"$game_data$",GRAPH_NAME); - header.m_graph_guid = CGameGraph(game_graph_name).header().guid(); - - writer.open_chunk (0); - writer.w_u32 (header.m_version); - writer.w (&header.m_guid,sizeof(header.m_guid)); - writer.w (&header.m_graph_guid,sizeof(header.m_graph_guid)); - writer.w_u32 (header.m_spawn_count); - writer.w_u32 (header.m_level_count); - writer.close_chunk (); - - return (true); -} - -bool spawn_patcher::process_spawns (IReader &reader, IWriter &writer) -{ - IReader *chunk = reader.open_chunk(1); - if (!chunk) { - Msg ("spawn is broken: cannot find header chunk"); - return (false); - } - - typedef CGameSpawnConstructor::SPAWN_GRAPH SPAWN_GRAPH; - SPAWN_GRAPH spawns; - - load_data (spawns,*chunk); - chunk->close (); - - writer.open_chunk (1); - save_data (spawns,writer); - writer.close_chunk (); - - return (true); -} - -bool spawn_patcher::process_level (IReader &reader, IWriter &writer) -{ - IReader *chunk = reader.open_chunk(2); - if (!chunk) { - Msg ("spawn is broken: cannot find header chunk"); - return (false); - } - - typedef CGameSpawnConstructor::LEVEL_POINT_STORAGE LEVEL_POINT_STORAGE; - LEVEL_POINT_STORAGE level_points; - - load_data (level_points,*chunk); - chunk->close (); - - writer.open_chunk (2); - save_data (level_points,writer); - writer.close_chunk (); - - return (true); -} - -bool spawn_patcher::process_patrol (IReader &reader, IWriter &writer) -{ - IReader *chunk = reader.open_chunk(3); - if (!chunk) { - Msg ("spawn is broken: cannot find header chunk"); - return (false); - } - - CPatrolPathStorage patrol_storage; - - load_data (patrol_storage,*chunk); - chunk->close (); - - writer.open_chunk (3); - save_data (patrol_storage,writer); - writer.close_chunk (); - - return (true); -} -#endif diff --git a/src/utils/xrAI/spawn_patcher.h b/src/utils/xrAI/spawn_patcher.h deleted file mode 100644 index 9a9fe07bc72..00000000000 --- a/src/utils/xrAI/spawn_patcher.h +++ /dev/null @@ -1,27 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// Module : spawn_patcher.h -// Created : 12.06.2007 -// Modified : 12.06.2007 -// Author : Dmitriy Iassenev -// Description : spawn patcher class -//////////////////////////////////////////////////////////////////////////// - -#ifndef SPAWN_PATCHER_H -#define SPAWN_PATCHER_H - -struct xrGUID; - -class spawn_patcher -{ -private: - static bool spawn_guid(LPCSTR spawn_id, xrGUID& result); - static bool process_header(IReader& reader, IWriter& writer, xrGUID& previous_spawn_guid); - static bool process_spawns(IReader& reader, IWriter& writer); - static bool process_level(IReader& reader, IWriter& writer); - static bool process_patrol(IReader& reader, IWriter& writer); - -public: - spawn_patcher(LPCSTR new_spawn_id, LPCSTR previous_spawn_id); -}; - -#endif // SPAWN_PATCHER_H diff --git a/src/utils/xrAI/xrAI.vcxproj b/src/utils/xrAI/xrAI.vcxproj index 2ff256b78e5..73ba73642de 100644 --- a/src/utils/xrAI/xrAI.vcxproj +++ b/src/utils/xrAI/xrAI.vcxproj @@ -178,7 +178,6 @@ - Create Create @@ -248,7 +247,6 @@ - diff --git a/src/utils/xrAI/xrAI.vcxproj.filters b/src/utils/xrAI/xrAI.vcxproj.filters index 6bea2c37402..2b0e7ff1482 100644 --- a/src/utils/xrAI/xrAI.vcxproj.filters +++ b/src/utils/xrAI/xrAI.vcxproj.filters @@ -61,9 +61,6 @@ {abd194f2-1c4c-45a2-a498-344b990c1c61} - - {bb8ce383-823f-4aed-ba06-4f466aa15ff3} - {1662641a-fb1b-4795-bf6e-272cfc78c210} @@ -153,9 +150,6 @@ ALife\Spawn\server_entity_wrapper - - ALife\Spawn\spawn_patcher - ALife\Verify @@ -335,9 +329,6 @@ ALife\Spawn\server_entity_wrapper - - ALife\Spawn\spawn_patcher - ALife\guid_generator