oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Split settings into seperate source and header files

Browse source 
This also cleans up settings a bit
This commit is contained in:
ShadowNinja 2014-09-11 18:22:05 -04:00
parent 2ae5d3f3ab
commit 6bc4cad0ed
27 changed files with 996 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/player.cpp
View file

@ -18,12 +18,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "player.h"
#include <fstream>
#include "util/numeric.h"
#include "hud.h"
#include "constants.h"
#include "gamedef.h"
#include "settings.h"
#include "content_sao.h"
#include "util/numeric.h"
#include "filesys.h"
#include "log.h"
Player::Player(IGameDef *gamedef):
touching_ground(false),
@ -195,18 +199,10 @@ void Player::serialize(std::ostream &os)
void Player::deSerialize(std::istream &is, std::string playername)
{
Settings args;
for(;;)
{
if(is.eof())
throw SerializationError
(("Player::deSerialize(): PlayerArgsEnd of player \"" + playername + "\" not found").c_str());
std::string line;
std::getline(is, line);
std::string trimmedline = trim(line);
if(trimmedline == "PlayerArgsEnd")
break;
args.parseConfigLine(line);
if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
throw SerializationError("PlayerArgsEnd of player " +
playername + " not found!");
}
//args.getS32("version"); // Version field value not used