[Widelands-cvs] SF.net SVN: widelands: [1989] trunk
Status: Beta
Brought to you by:
sirver
Menu
▾
▴
[Widelands-cvs] SF.net SVN: widelands: [1989] trunk
|
From: <be...@us...> - 2007-01-29 21:41:28
|
Revision: 1989
http://svn.sourceforge.net/widelands/?rev=1989&view=rev
Author: bedouin
Date: 2007-01-29 13:41:23 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
- fix variable shadowing to clean up compiles
- remove an unused variable
Modified Paths:
--------------
trunk/build/scons-tools/scons_configure.py
trunk/src/critter_bob.cc
trunk/src/critter_bob.h
trunk/src/event_set_null_trigger.cc
trunk/src/event_unhide_objective.cc
trunk/src/game.cc
trunk/src/immovable.cc
trunk/src/immovable.h
trunk/src/layered_filesystem.cc
trunk/src/soldier.cc
trunk/src/soldier.h
trunk/src/tribe.cc
trunk/src/tribe.h
trunk/src/ui/ui_basic/ui_panel.cc
trunk/src/warehouse.cc
trunk/src/worker.cc
trunk/src/worker.h
Modified: trunk/build/scons-tools/scons_configure.py
===================================================================
--- trunk/build/scons-tools/scons_configure.py 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/build/scons-tools/scons_configure.py 2007-01-29 21:41:23 UTC (rev 1989)
@@ -306,6 +306,7 @@
conf.CheckCompilerFlag('-Wstrict-aliasing=2', env)
#conf.CheckCompilerFlag('-Wunreachable-code', env)
conf.CheckCompilerFlag('-Wwrite-strings', env)
+ conf.CheckCompilerFlag('-Wno-deprecated-declarations', env)
if env.optimize:
# !!!! -fomit-frame-pointer breaks execeptions !!!!
Modified: trunk/src/critter_bob.cc
===================================================================
--- trunk/src/critter_bob.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/critter_bob.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -194,12 +194,13 @@
Get a program from the workers description.
===============
*/
-const Critter_BobProgram* Critter_Bob_Descr::get_program(std::string name) const
+const Critter_BobProgram* Critter_Bob_Descr::get_program(std::string programname)
+ const
{
- ProgramMap::const_iterator it = m_programs.find(name);
+ ProgramMap::const_iterator it = m_programs.find(programname);
if (it == m_programs.end())
- throw wexception("%s has no program '%s'", get_name(), name.c_str());
+ throw wexception("%s has no program '%s'", get_name(), programname.c_str());
return it->second;
}
@@ -213,11 +214,7 @@
m_swimming = s->get_bool("swimming", false);
- // Read all walking animations.
- // Default settings are in [walk]
- char sectname[256];
-
- // Pretty name
+ // Pretty name
m_descname = s->get_safe_string("descname");
m_walk_anims.parse
@@ -313,10 +310,10 @@
Start the given program.
===============
*/
-void Critter_Bob::start_task_program(const std::string & name) {
+void Critter_Bob::start_task_program(const std::string & programname) {
push_task(taskProgram);
State & state = top_state();
- state.program = get_descr()->get_program(name);
+ state.program = get_descr()->get_program(programname);
state.ivar1 = 0;
}
Modified: trunk/src/critter_bob.h
===================================================================
--- trunk/src/critter_bob.h 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/critter_bob.h 2007-01-29 21:41:23 UTC (rev 1989)
@@ -41,7 +41,7 @@
const std::string & descname() const throw () {return m_descname;}
const char * get_descname() const throw () __attribute__ ((deprecated)) {return descname().c_str();}
- const Critter_BobProgram* get_program(std::string name) const;
+ const Critter_BobProgram* get_program(std::string programname) const;
private:
std::string m_descname;
Modified: trunk/src/event_set_null_trigger.cc
===================================================================
--- trunk/src/event_set_null_trigger.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/event_set_null_trigger.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -58,17 +58,17 @@
void Event_Set_Null_Trigger::Read(Section* s, Editor_Game_Base* egbase) {
const int event_version = s->get_safe_int("version");
if (event_version == EVENT_VERSION) {
- const std::string name = s->get_safe_string("trigger");
+ const std::string triggername = s->get_safe_string("trigger");
if
(Trigger_Null * const trig = static_cast<Trigger_Null * const>
- (egbase->map().get_mtm().get_trigger(name.c_str())))
+ (egbase->map().get_mtm().get_trigger(triggername.c_str())))
{
// Bit Hackish, hopefully the user paid attention
set_trigger(trig);
set_setto(s->get_bool("setto"));
} else throw wexception
("Set Null Trigger event with unknown trigger %s in map!\n",
- name.c_str());
+ triggername.c_str());
} else throw wexception
("Set Null Trigger Event with unknown/unhandled version %i in map!\n",
event_version);
Modified: trunk/src/event_unhide_objective.cc
===================================================================
--- trunk/src/event_unhide_objective.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/event_unhide_objective.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -54,10 +54,11 @@
void Event_Unhide_Objective::Read(Section* s, Editor_Game_Base* egbase) {
int version=s->get_safe_int("version");
if(version == EVENT_VERSION) {
- std::string name = s->get_safe_string("objective");
- MapObjective * const obj = egbase->get_map()->get_mom().get_objective(name.c_str());
+ std::string objectivename = s->get_safe_string("objective");
+ MapObjective * const obj = egbase->get_map()->get_mom().get_objective(objectivename.c_str());
if( !obj ) {
- throw wexception("Unhide Objective event with unknown objecive %s in map!\n", name.c_str());
+ throw wexception("Unhide Objective event with unknown objecive %s in map!\n",
+ objectivename.c_str());
}
set_objective( obj );
set_dounhide(s->get_bool("dounhide"));
Modified: trunk/src/game.cc
===================================================================
--- trunk/src/game.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/game.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -284,14 +284,14 @@
if(!is_savegame) {
// Prepare the players (i.e. place HQs)
for (int i = 1; i <= get_map()->get_nrplayers(); i++) {
- Player* player = get_player(i);
- if (!player)
+ Player* plr = get_player(i);
+ if (!plr)
continue;
- player->init(true);
+ plr->init(true);
const Coords &c = get_map()->get_starting_pos(i);
- if (player->get_type() == Player::Local) ipl->move_view_to(c);
+ if (plr->get_type() == Player::Local) ipl->move_view_to(c);
}
// Prepare the map, set default textures
Modified: trunk/src/immovable.cc
===================================================================
--- trunk/src/immovable.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/immovable.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -260,12 +260,14 @@
Find the program of the given name.
===============
*/
-const ImmovableProgram* Immovable_Descr::get_program(std::string name) const
+const ImmovableProgram* Immovable_Descr::get_program(std::string programname)
+ const
{
- ProgramMap::const_iterator it = m_programs.find(name);
+ ProgramMap::const_iterator it = m_programs.find(programname);
if (it == m_programs.end())
- throw wexception("Immovable %s has no program '%s'", get_name(), name.c_str());
+ throw wexception("Immovable %s has no program '%s'", get_name(),
+ programname.c_str());
return it->second;
}
@@ -377,18 +379,19 @@
Parse a program.
===============
*/
-void Immovable_Descr::parse_program(std::string directory, Profile* prof, std::string name)
+void Immovable_Descr::parse_program(std::string directory, Profile* prof,
+ std::string programname)
{
ImmovableProgram* prog = 0;
- if (m_programs.find(name) != m_programs.end())
- throw wexception("Duplicate program '%s'", name.c_str());
+ if (m_programs.find(programname) != m_programs.end())
+ throw wexception("Duplicate program '%s'", programname.c_str());
try
{
- prog = new ImmovableProgram(name);
+ prog = new ImmovableProgram(programname);
prog->parse(this, directory, prof);
- m_programs[name] = prog;
+ m_programs[programname] = prog;
}
catch(...)
{
@@ -565,9 +568,9 @@
Switch the currently running program.
===============
*/
-void Immovable::switch_program(Game* g, std::string name)
+void Immovable::switch_program(Game* g, std::string programname)
{
- m_program = get_descr()->get_program(name);
+ m_program = get_descr()->get_program(programname);
m_program_ptr = 0;
run_program(g, false);
Modified: trunk/src/immovable.h
===================================================================
--- trunk/src/immovable.h 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/immovable.h 2007-01-29 21:41:23 UTC (rev 1989)
@@ -81,11 +81,11 @@
const char * get_name() const throw () __attribute__ ((deprecated)) {return m_name.c_str();}
int get_size() const throw () {return m_size;}
inline const char* get_picture(void) const { return m_picture.c_str(); }
- const ImmovableProgram* get_program(std::string name) const;
+ const ImmovableProgram* get_program(std::string programname) const;
inline const EncodeData& get_default_encodedata() const { return m_default_encodedata; }
void parse(const char *directory, Profile *s);
- void parse_program(std::string directory, Profile* prof, std::string name);
+ void parse_program(std::string directory, Profile* prof, std::string programname);
uint parse_animation(std::string directory, Profile* prof, std::string name);
void parse_playFX(std::string directory, Profile* prof, std::string name);
Immovable *create(Editor_Game_Base *g, Coords coords);
@@ -128,7 +128,7 @@
virtual void draw
(const Editor_Game_Base &, RenderTarget &, const FCoords, const Point);
- void switch_program(Game* g, std::string name);
+ void switch_program(Game* g, std::string programname);
const Tribe_Descr * get_owner_tribe() const throw ()
{return descr().get_owner_tribe();}
Modified: trunk/src/layered_filesystem.cc
===================================================================
--- trunk/src/layered_filesystem.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/layered_filesystem.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -245,8 +245,8 @@
for(FileSystem_rit it = m_filesystems.rbegin();
it != m_filesystems.rend(); it++)
{
- if (!(*it)->IsWritable())
- continue;
+ //if (!(*it)->IsWritable())
+ // continue;
return (*it)->CreateSubFileSystem( dirname, type );
}
Modified: trunk/src/soldier.cc
===================================================================
--- trunk/src/soldier.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/soldier.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -624,10 +624,10 @@
*
*/
void Soldier::start_animation
-(Editor_Game_Base* gg, const char * const name, const uint time)
+(Editor_Game_Base* gg, const char * const animname, const uint time)
{
Game * const game = dynamic_cast<Game * const>(gg);
- if (game) start_task_idle (game, get_descr()->get_rand_anim(name), time);
+ if (game) start_task_idle (game, get_descr()->get_rand_anim(animname), time);
}
/**
Modified: trunk/src/soldier.h
===================================================================
--- trunk/src/soldier.h 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/soldier.h 2007-01-29 21:41:23 UTC (rev 1989)
@@ -163,7 +163,7 @@
/// Sets a random animation of desired type and start playing it
void start_animation
- (Editor_Game_Base*, const char * const name, const uint time);
+ (Editor_Game_Base*, const char * const animname, const uint time);
/// Heal quantity of hit points instantly
void heal (const uint);
Modified: trunk/src/tribe.cc
===================================================================
--- trunk/src/tribe.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/tribe.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -39,16 +39,16 @@
//
// Tribe_Descr class
//
-Tribe_Descr::Tribe_Descr(const std::string & name) : m_name(name) {
+Tribe_Descr::Tribe_Descr(const std::string & tribename) : m_name(tribename) {
try
{
char directory[256];
// Grab the localisation text domain
- sprintf( directory, "tribe_%s", name.c_str() );
+ sprintf( directory, "tribe_%s", tribename.c_str() );
i18n::grab_textdomain( directory );
- snprintf(directory, sizeof(directory), "tribes/%s", name.c_str());
+ snprintf(directory, sizeof(directory), "tribes/%s", tribename.c_str());
m_default_encdata.clear();
parse_wares(directory);
@@ -60,7 +60,7 @@
i18n::release_textdomain( );
}
catch(std::exception &e)
- {throw wexception("Error loading tribe %s: %s", name.c_str(), e.what());}
+ {throw wexception("Error loading tribe %s: %s", tribename.c_str(), e.what());}
}
@@ -154,8 +154,8 @@
if (not m_wares.exists(value->get_name()))
throw wexception("In section [startwares], ware %s is not know!", value->get_name());
- std::string name=value->get_name();
- m_startwares[name]=value->get_int();
+ std::string valuename=value->get_name();
+ m_startwares[valuename]=value->get_int();
}
// default workers
@@ -165,8 +165,8 @@
if (not m_workers.exists(value->get_name()))
throw wexception("In section [startworkers], worker %s is not know!", value->get_name());
- std::string name=value->get_name();
- m_startworkers[name]=value->get_int();
+ std::string valuename=value->get_name();
+ m_startworkers[valuename]=value->get_int();
}
// default soldiers
@@ -330,7 +330,7 @@
if (!g_fs->FileExists(fname))
continue;
- const char *name;
+ const char *warename;
const char *slash = strrchr(it->c_str(), '/');
const char *backslash = strrchr(it->c_str(), '\\');
@@ -338,18 +338,18 @@
slash = backslash;
if (slash)
- name = slash+1;
+ warename = slash+1;
else
- name = it->c_str();
+ warename = it->c_str();
- if (wares->exists(name))
+ if (wares->exists(warename))
log("Ware %s is already known in world init\n", it->c_str());
Item_Ware_Descr* descr = 0;
try
{
- descr = Item_Ware_Descr::create_from_dir(name, it->c_str());
+ descr = Item_Ware_Descr::create_from_dir(warename, it->c_str());
}
catch(std::exception& e)
{
@@ -384,7 +384,7 @@
if (!g_fs->FileExists(fname))
continue;
- const char *name;
+ const char *dirname;
const char *slash = strrchr(it->c_str(), '/');
const char *backslash = strrchr(it->c_str(), '\\');
@@ -392,9 +392,9 @@
slash = backslash;
if (slash)
- name = slash+1;
+ dirname = slash+1;
else
- name = it->c_str();
+ dirname = it->c_str();
try
{
@@ -404,10 +404,10 @@
if (!strcasecmp(type, "critter")) {
Bob_Descr *descr;
- descr = Bob_Descr::create_from_dir(name, it->c_str(), &prof, this);
+ descr = Bob_Descr::create_from_dir(dirname, it->c_str(), &prof, this);
m_bobs.add(descr);
} else {
- Immovable_Descr * const descr = new Immovable_Descr(this, name);
+ Immovable_Descr * const descr = new Immovable_Descr(this, dirname);
descr->parse(it->c_str(), &prof);
m_immovables.add(descr);
}
@@ -569,33 +569,36 @@
/*
* Return the given ware or die trying
*/
-int Tribe_Descr::get_safe_ware_index(const char * const name) const {
- int retval=get_ware_index(name);
+int Tribe_Descr::get_safe_ware_index(const char * const warename) const {
+ int retval=get_ware_index(warename);
if(retval==-1)
- throw wexception("Tribe_Descr::get_safe_ware_index: Unknown ware %s!", name);
+ throw wexception("Tribe_Descr::get_safe_ware_index: Unknown ware %s!",
+ warename);
return retval;
}
/*
* Return the given worker or die trying
*/
-int Tribe_Descr::get_safe_worker_index(const char * const name) const {
- int retval=get_worker_index(name);
+int Tribe_Descr::get_safe_worker_index(const char * const workername) const {
+ int retval=get_worker_index(workername);
if(retval==-1)
- throw wexception("Tribe_Descr::get_safe_worker_index: Unknown worker %s!", name);
+ throw wexception("Tribe_Descr::get_safe_worker_index: Unknown worker %s!",
+ workername);
return retval;
}
/*
* Return the given building or die trying
*/
-int Tribe_Descr::get_safe_building_index(const char *name) const {
- int retval=get_building_index(name);
+int Tribe_Descr::get_safe_building_index(const char *buildingname) const {
+ int retval=get_building_index(buildingname);
if(retval==-1)
- throw wexception("Tribe_Descr::get_safe_building_index: Unknown building %s!", name);
+ throw wexception("Tribe_Descr::get_safe_building_index: Unknown building %s!",
+ buildingname);
return retval;
}
Modified: trunk/src/tribe.h
===================================================================
--- trunk/src/tribe.h 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/tribe.h 2007-01-29 21:41:23 UTC (rev 1989)
@@ -51,7 +51,7 @@
ERR_WRONGVERSION
};
- Tribe_Descr(const std::string & name);
+ Tribe_Descr(const std::string & tribename);
// Static function to check for tribes
static bool exists_tribe(const std::string & name);
@@ -64,18 +64,18 @@
inline int get_nrworkers() const { return m_workers.get_nitems(); }
Worker_Descr * get_worker_descr(const uint idx) const
{return m_workers.get(idx);}
- int get_worker_index(const char * const name) const
- {return m_workers.get_index(name);}
+ int get_worker_index(const char * const workername) const
+ {return m_workers.get_index(workername);}
inline int get_nrwares() const { return m_wares.get_nitems(); }
- int get_safe_ware_index(const char * const name) const;
- int get_ware_index(const char * const name) const
- {return m_wares.get_index(name);}
+ int get_safe_ware_index(const char * const warename) const;
+ int get_ware_index(const char * const warename) const
+ {return m_wares.get_index(warename);}
inline Item_Ware_Descr* get_ware_descr(uint idx) const { return m_wares.get(idx); }
- int get_safe_worker_index(const char * const name) const;
+ int get_safe_worker_index(const char * const workername) const;
int get_nrbuildings() const { return m_buildings.get_nitems(); }
int get_safe_building_index(const char *name) const;
- int get_building_index(const char * const name) const
- {return m_buildings.get_index(name);}
+ int get_building_index(const char * const buildingname) const
+ {return m_buildings.get_index(buildingname);}
Building_Descr *get_building_descr(uint idx) const { return m_buildings.get(idx); }
inline int get_immovable_index(const char* l) const { return m_immovables.get_index(l); }
inline int get_nr_immovables(void) { return m_immovables.get_nitems(); }
Modified: trunk/src/ui/ui_basic/ui_panel.cc
===================================================================
--- trunk/src/ui/ui_basic/ui_panel.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/ui/ui_basic/ui_panel.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -27,14 +27,7 @@
#include "wlapplication.h"
namespace UI {
-/*
-==============================================================================
-Panel
-
-==============================================================================
-*/
-
Panel *Panel::_modal = 0;
Panel *Panel::_g_mousegrab = 0;
Panel *Panel::_g_mousein = 0;
Modified: trunk/src/warehouse.cc
===================================================================
--- trunk/src/warehouse.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/warehouse.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -524,11 +524,11 @@
workerdescr = get_owner()->get_tribe()->get_worker_descr(ware);
// Look if we got one in stock of those
- std::string name=workerdescr->get_name();
+ std::string workername=workerdescr->get_name();
std::vector<Object_Ptr>::iterator i;
for(i=m_incorporated_workers.begin(); i!=m_incorporated_workers.end(); i++)
{
- if(static_cast<Worker*>(i->get(g))->get_name()==name)
+ if(static_cast<Worker*>(i->get(g))->get_name()==workername)
{
soldier = static_cast<Soldier*>(i->get(g));
@@ -696,11 +696,11 @@
workerdescr = get_owner()->get_tribe()->get_worker_descr(ware);
// Look if we got one in stock of those
- std::string name=workerdescr->get_name();
+ std::string workername=workerdescr->get_name();
std::vector<Object_Ptr>::iterator i;
for(i=m_incorporated_workers.begin();
i!=m_incorporated_workers.end(); i++)
- if(static_cast<Worker*>(i->get(g))->get_name()==name) break;
+ if(static_cast<Worker*>(i->get(g))->get_name()==workername) break;
if(i==m_incorporated_workers.end()) {
// None found, create a new one (if available)
@@ -736,11 +736,11 @@
workerdescr = get_owner()->get_tribe()->get_worker_descr(ware);
// Look if we got one in stock of those
- std::string name=workerdescr->get_name();
+ std::string workername=workerdescr->get_name();
std::vector<Object_Ptr>::iterator i;
for(i=m_incorporated_workers.begin(); i!=m_incorporated_workers.end(); i++)
{
- if(static_cast<Worker*>(i->get(g))->get_name()==name)
+ if(static_cast<Worker*>(i->get(g))->get_name()==workername)
{
soldier = static_cast<Soldier*>(i->get(g));
if
@@ -796,11 +796,11 @@
workerdescr = get_owner()->get_tribe()->get_worker_descr(ware);
// Look if we got one in stock of those
- std::string name=workerdescr->get_name();
+ std::string workername=workerdescr->get_name();
std::vector<Object_Ptr>::iterator i;
for(i=m_incorporated_workers.begin(); i!=m_incorporated_workers.end(); i++)
{
- if(static_cast<Worker*>(i->get(g))->get_name()==name)
+ if(static_cast<Worker*>(i->get(g))->get_name()==workername)
{
soldier = static_cast<Soldier*>(i->get(g));
if (!soldier->is_marked())
@@ -874,13 +874,13 @@
/*
* Sort the worker into the right position in m_incorporated_workers
*/
-void Warehouse::sort_worker_in(Editor_Game_Base* g, std::string name, Worker* w) {
+void Warehouse::sort_worker_in(Editor_Game_Base* g, std::string workername, Worker* w) {
// We insert this worker, but to keep some consistency in ordering, we tell him
// where to insert
std::vector<Object_Ptr>::iterator i=m_incorporated_workers.begin();
- while(i!= m_incorporated_workers.end() && name <= static_cast<Worker*>(i->get(g))->get_name()) ++i;
+ while(i!= m_incorporated_workers.end() && workername <= static_cast<Worker*>(i->get(g))->get_name()) ++i;
if(i==m_incorporated_workers.end()) {
m_incorporated_workers.insert(i, w);
return;
@@ -903,9 +903,9 @@
WareInstance* item;
// Create the item
- Item_Ware_Descr* descr=get_owner()->get_tribe()->get_ware_descr(ware);
- assert(descr);
- item = new WareInstance(ware, descr);
+ Item_Ware_Descr* waredescr=get_owner()->get_tribe()->get_ware_descr(ware);
+ assert(waredescr);
+ item = new WareInstance(ware, waredescr);
item->init(g);
m_supply->remove_wares(ware, 1);
@@ -1004,12 +1004,12 @@
workerdescr = get_owner()->get_tribe()->get_worker_descr(w);
// Look if we got one in stock of those
- std::string name=workerdescr->get_name();
+ std::string workername=workerdescr->get_name();
std::vector<Object_Ptr>::iterator i;
for(i=m_incorporated_workers.begin(); i!=m_incorporated_workers.end(); i++)
{
- if(static_cast<Worker*>(i->get(g))->get_name()==name)
+ if(static_cast<Worker*>(i->get(g))->get_name()==workername)
{
soldier = static_cast<Soldier*>(i->get(g));
Modified: trunk/src/worker.cc
===================================================================
--- trunk/src/worker.cc 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/worker.cc 2007-01-29 21:41:23 UTC (rev 1989)
@@ -1504,12 +1504,12 @@
Get a program from the workers description.
===============
*/
-const WorkerProgram* Worker_Descr::get_program(std::string name) const
+const WorkerProgram* Worker_Descr::get_program(std::string programname) const
{
- ProgramMap::const_iterator it = m_programs.find(name);
+ ProgramMap::const_iterator it = m_programs.find(programname);
if (it == m_programs.end())
- throw wexception("%s has no program '%s'", get_name(), name.c_str());
+ throw wexception("%s has no program '%s'", get_name(), programname.c_str());
return it->second;
}
@@ -2540,10 +2540,10 @@
Start the given program.
===============
*/
-void Worker::start_task_program(const std::string & name) {
+void Worker::start_task_program(const std::string & programname) {
push_task(taskProgram);
State & state = top_state();
- state.program = get_descr()->get_program(name);
+ state.program = get_descr()->get_program(programname);
state.ivar1 = 0;
}
Modified: trunk/src/worker.h
===================================================================
--- trunk/src/worker.h 2007-01-29 12:47:33 UTC (rev 1988)
+++ trunk/src/worker.h 2007-01-29 21:41:23 UTC (rev 1989)
@@ -91,7 +91,7 @@
const DirAnimations & get_right_walk_anims(const bool carries_ware) const
throw ()
{return carries_ware ? m_walkload_anims : m_walk_anims;}
- const WorkerProgram* get_program(std::string name) const;
+ const WorkerProgram* get_program(std::string programname) const;
virtual Worker_Type get_worker_type(void) const { return NORMAL; }
@@ -198,7 +198,7 @@
void update_task_buildingwork(Game* g);
void start_task_return(Game* g, bool dropitem);
- void start_task_program(const std::string & name);
+ void start_task_program(const std::string & programname);
virtual void start_task_gowarehouse();
void start_task_dropoff(Game* g, WareInstance* item);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|