mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-09 20:27:45 +00:00
Code Activity

clean up generated script public/private members

Browse source
This commit is contained in:
Tahir Akhlaq 2017-12-17 10:37:29 +00:00
parent 83f88102f9
commit e69a5d1cd4
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools/pcb_reader/main.cpp
View file

@ -128,7 +128,7 @@ void readFileToBuffer( const std::string& path, std::vector< char >& buf )
if( inFile.good() ) if( inFile.good() )
{ {
inFile.seekg( 0, inFile.end ); inFile.seekg( 0, inFile.end );
int32_t fileSize = inFile.tellg(); int32_t fileSize = (int32_t)inFile.tellg();
buf.resize( fileSize ); buf.resize( fileSize );
inFile.seekg( 0, inFile.beg ); inFile.seekg( 0, inFile.beg );
inFile.read( &buf[0], fileSize ); inFile.read( &buf[0], fileSize );

38
src/tools/quest_parser/main.cpp
View file

@ -1,39 +1,42 @@
#include <cstdint>
#include <GameData.h> #include <fstream>
#include <File.h>
#include <DatCat.h>
#include <ExdData.h>
#include <ExdCat.h>
#include <Exd.h>
#include <iostream> #include <iostream>
#include <locale>
#include <set> #include <set>
#include <src/servers/Server_Common/Exd/ExdData.h> #include <string>
#include <src/servers/Server_Common/Logging/Logger.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <locale> #include <Exd.h>
#include <fstream> #include <ExdCat.h>
#include <ExdData.h>
#include <File.h>
#include <GameData.h>
#include <DatCat.h>
#include <src/servers/Server_Common/Exd/ExdData.h>
#include <src/servers/Server_Common/Logging/Logger.h>
Core::Logger g_log; Core::Logger g_log;
Core::Data::ExdData g_exdData; Core::Data::ExdData g_exdData;
const std::string onTalkStr( const std::string onTalkStr(
" void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId )\n" " void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n"
" {\n" " {\n"
" auto actor = Core::Event::mapEventActorToRealActor( actorId );\n" " auto actor = Core::Event::mapEventActorToRealActor( actorId );\n"
" }\n\n" " }\n\n"
); );
const std::string onWithinRangeStr( const std::string onWithinRangeStr(
" void onWithinRange( uint32_t eventId, Entity::Player& player, uint64_t eRangeId, float x, float y, float z )\n" " void onWithinRange( uint32_t eventId, Entity::Player& player, uint64_t eRangeId, float x, float y, float z ) override\n"
" {\n" " {\n"
" }\n\n" " }\n\n"
); );
const std::string onEmoteStr( const std::string onEmoteStr(
" void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId )\n" " void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n"
" {\n" " {\n"
" }\n\n" " }\n\n"
); );
@ -242,12 +245,12 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo >& pQuestData, std::
if( hasERange ) if( hasERange )
{ {
scriptEntry += onWithinRangeStr; scriptEntry += onWithinRangeStr;
} }
if( hasEmote ) if( hasEmote )
{ {
scriptEntry += onEmoteStr; scriptEntry += onEmoteStr;
} }
for( auto enemy : enemy_ids ) for( auto enemy : enemy_ids )
@ -276,8 +279,9 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo >& pQuestData, std::
"{\n" + "{\n" +
constructor + constructor +
"\n" + "\n" +
sceneStr +
scriptEntry + scriptEntry +
" private:\n" +
sceneStr +
"};\n\n" "};\n\n"
); );