Skip to content
Permalink
Browse files

besch -> desc

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@8055 8aca7d54-2c30-db11-9de9-000461428c89
  • Loading branch information
Dwachs committed Feb 2, 2017
1 parent 8d092c8 commit 9419adfa573ca6ec4e50a5b86e69647f5cc267ab
@@ -86,8 +86,8 @@ obj_desc_t *factory_field_group_reader_t::read_node(FILE *fp, obj_node_info_t &n
}
else if( v==0x8001 ) {
/* Knightly :
* leave shared, common data in field besch
* field class specific data goes to field class besch
* leave shared, common data in field desc
* field class specific data goes to field class desc
*/
field_class_desc_t *const field_class_desc = new field_class_desc_t();

@@ -120,7 +120,7 @@ void factory_field_group_reader_t::register_obj(obj_desc_t *&data)
{
field_group_desc_t *const desc = static_cast<field_group_desc_t *>(data);

// Knightly : check if we need to continue with the construction of field class besch
// Knightly : check if we need to continue with the construction of field class desc
if (field_class_desc_t *const field_class_desc = incomplete_field_class_desc) {
// we *must* transfer the obj_desc_t array and not just the desc object itself
// as xref reader has already logged the address of the array element for xref resolution
@@ -6,7 +6,7 @@

class field_class_desc_t;

// Knightly : new reader for field class besch
// Knightly : new reader for field class desc
class factory_field_class_reader_t : public obj_reader_t {
friend class factory_field_group_reader_t; // Knightly : this is a special case due to desc restructuring

@@ -6,7 +6,7 @@
#include "../objversion.h"


// Knightly : new writer class for field class besch
// Knightly : new writer class for field class desc
class factory_field_class_writer_t : public obj_writer_t {
private:
static factory_field_class_writer_t the_instance;
@@ -1392,7 +1392,7 @@ void ai_goods_t::rdwr(loadsave_t *file)
// what freight?
const char *s = freight ? freight->get_name() : NULL;
file->rdwr_str( s );
// vehicles besch
// vehicles desc
s = rail_engine ? rail_engine->get_name() : NULL;
file->rdwr_str( s );
s = rail_vehicle ? rail_vehicle->get_name() : NULL;
@@ -2492,7 +2492,7 @@ waytype_t tool_build_bridge_t::get_waytype() const
bool tool_build_bridge_t::init( player_t *player )
{
two_click_tool_t::init( player );
// now get current besch
// now get current desc
const bridge_desc_t *desc = bridge_builder_t::get_desc(default_param);
if( desc && !desc->is_available(welt->get_timeline_year_month()) && player!=NULL && player!=welt->get_public_player() ) {
return false;
@@ -2767,7 +2767,7 @@ waytype_t tool_build_tunnel_t::get_waytype() const
bool tool_build_tunnel_t::init( player_t *player )
{
two_click_tool_t::init( player );
// now get current besch
// now get current desc
const tunnel_desc_t *desc = tunnel_builder_t::get_desc(default_param);
if( desc && !desc->is_available(welt->get_timeline_year_month()) && player!=NULL && player!=welt->get_public_player() ) {
return false;
@@ -209,3 +209,5 @@ besch_vorgaenger,desc_leader
besch_nachfolger,desc_trailer
Modulbeschreibung,Description
besch_,desc_
besch\\\\,descriptor\\\\
\\<besch\\>,desc
@@ -38,7 +38,7 @@ class movingobj_t : public vehicle_base_t, public sync_steppable
/// static table to find desc by name
static stringhashtable_tpl<groundobj_desc_t *> desc_table;

/// static vector for fast lookup of besch
/// static vector for fast lookup of desc
static vector_tpl<const groundobj_desc_t *> movingobj_typen;

protected:

0 comments on commit 9419adf

Please sign in to comment.
You can’t perform that action at this time.