0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switched to new logging system.

Browse source
This commit is contained in:
Guillaume Melquiond 2004-12-04 15:14:09 +00:00
parent d16fad73e8
commit ab0a4a1e53
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gamestatus.hpp
View file

@ -13,6 +13,7 @@
#ifndef GAME_STATUS_HPP_INCLUDED
#define GAME_STATUS_HPP_INCLUDED
#include "log.hpp"
#include "unit.hpp"
#include "unit_types.hpp"
@ -147,11 +148,10 @@ struct game_state
// Return the Nth player, or NULL if no such player exists
player_info* get_player(const std::string& id) {
std::cerr << "get_player('" << id << "')\n";
std::map<std::string, player_info>::iterator found=players.find(id);
if(found==players.end()) {
std::cerr << "WARNING: player " << id << " does not exist." << std::endl;
lg::warn(lg::engine) << "player " << id << " does not exist." << std::endl;
return NULL;
} else {
return &found->second;

15
src/team.cpp
View file

@ -16,6 +16,7 @@
#include "game_config.hpp"
#include "game_events.hpp"
#include "gamestatus.hpp"
#include "log.hpp"
#include "network.hpp"
#include "replay.hpp"
#include "team.hpp"
@ -25,6 +26,8 @@
#include <cstdlib>
#include <sstream>
#define LOG_NG lg::info(lg::engine)
namespace {
std::vector<team>* teams = NULL;
}
@ -180,8 +183,8 @@ team::team_info::team_info(const config& cfg)
share_view = (cfg["share_view"] == "yes");
share_maps = !share_view && (cfg["share_maps"] != "no");
std::cerr << "team_info::team_info(...): team_name: " << team_name;
std::cerr << ", share_maps: " << share_maps << ", share_view: " << share_view << ".\n";
LOG_NG << "team_info::team_info(...): team_name: " << team_name
<< ", share_maps: " << share_maps << ", share_view: " << share_view << ".\n";
music = cfg["music"];
}
@ -269,8 +272,8 @@ team::team(const config& cfg, int gold) : gold_(gold), auto_shroud_updates_(true
shroud_.set_enabled(cfg["shroud"] == "yes");
shroud_.read(cfg["shroud_data"]);
std::cerr << "team::team(...): team_name: " << info_.team_name;
std::cerr << ", shroud: " << uses_shroud() << ", fog: " << uses_fog() << ".\n";
LOG_NG << "team::team(...): team_name: " << info_.team_name
<< ", shroud: " << uses_shroud() << ", fog: " << uses_fog() << ".\n";
//gold is the maximum of 'gold' and what is given in the config file
if(info_.gold.empty() == false)
@ -380,7 +383,8 @@ void team::set_time_of_day(int turn, const time_of_day& tod)
aggression_ = lexical_cast_default<double>(aiparams_["aggression"],0.5);
caution_ = lexical_cast_default<double>(aiparams_["caution"],0.25);
std::cerr << "for turn " << turn << ", time of day '" << tod.id << "' set ai_params to: ---\n" << aiparams_.write() << "\n---\n";
LOG_NG << "for turn " << turn << ", time of day '" << tod.id << "' set ai_params to: ---\n"
<< aiparams_.write() << "\n---\n";
}
void team::spend_gold(int amount)
@ -678,7 +682,6 @@ void validate_side(int side)
}
if(side < 1 || side > int(teams->size())) {
std::cerr << "invalid side " << side << " throwing game_error\n";
throw gamestatus::game_error("invalid side found in unit definition");
}
}