dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only include TBTR debug functions when debugging enabled.

Browse Source 
Add an initial prefix for clarity.
Fix log print format codes.
This commit is contained in:
Jonathan G Rennison
2016-02-13 20:44:11 +00:00
parent a31e7ac87d
commit 1ebd0af2c6
2 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/tbtr_template_vehicle_func.cpp
View File

@@ -45,43 +45,50 @@
Vehicle *vhead, *vtmp; Vehicle *vhead, *vtmp;
static const uint MAX_ARTICULATED_PARTS = 100; static const uint MAX_ARTICULATED_PARTS = 100;
#ifdef _DEBUG
// debugging printing functions for convenience, usually called from gdb // debugging printing functions for convenience, usually called from gdb
void pat() { void tbtr_debug_pat()
{
TemplateVehicle *tv; TemplateVehicle *tv;
FOR_ALL_TEMPLATES(tv) { FOR_ALL_TEMPLATES(tv) {
if ( tv->Prev() ) continue; if (tv->Prev()) continue;
ptv(tv); tbtr_debug_ptv(tv);
printf("__________\n"); printf("__________\n");
} }
} }
void pav() {
Train *t;
FOR_ALL_TRAINS(t) {
if ( t->Previous() ) continue;
pvt(t);
printf("__________\n");
}
}
void ptv(TemplateVehicle* tv) {
if (!tv) return;
while (tv->Next() ) {
printf("eid:%3d st:%2d tv:%x next:%x cargo: %d cargo_sub: %d\n", tv->engine_type, tv->subtype, tv, tv->Next(), tv->cargo_type, tv->cargo_subtype);
tv = tv->Next();
}
printf("eid:%3d st:%2d tv:%x next:%x cargo: %d cargo_sub: %d\n", tv->engine_type, tv->subtype, tv, tv->Next(), tv->cargo_type, tv->cargo_subtype);
}
void pvt (const Train *printme) { void tbtr_debug_pav()
for ( const Train *tmp = printme; tmp; tmp=tmp->Next() ) { {
if ( tmp->index <= 0 ) { Train *t;
printf("train has weird index: %d %d %x\n", tmp->index, tmp->engine_type, (__int64)tmp); FOR_ALL_TRAINS(t) {
return; if (t->Previous()) continue;
} tbtr_debug_pvt(t);
printf("eid:%3d index:%2d subtype:%2d vehstat: %d cargo_t: %d cargo_sub: %d ref:%x\n", tmp->engine_type, tmp->index, tmp->subtype, tmp->vehstatus, tmp->cargo_type, tmp->cargo_subtype, tmp); printf("__________\n");
} }
} }
void tbtr_debug_ptv(TemplateVehicle* tv)
{
if (!tv) return;
while (tv->Next() ) {
printf("eid:%3d st:%2d tv:%p next:%p cargo: %d cargo_sub: %d\n", tv->engine_type, tv->subtype, tv, tv->Next(), tv->cargo_type, tv->cargo_subtype);
tv = tv->Next();
}
printf("eid:%3d st:%2d tv:%p next:%p cargo: %d cargo_sub: %d\n", tv->engine_type, tv->subtype, tv, tv->Next(), tv->cargo_type, tv->cargo_subtype);
}
void tbtr_debug_pvt (const Train *printme)
{
for (const Train *tmp = printme; tmp; tmp = tmp->Next()) {
if (tmp->index <= 0) {
printf("train has weird index: %d %d %p\n", tmp->index, tmp->engine_type, tmp);
return;
}
printf("eid:%3d index:%2d subtype:%2d vehstat: %d cargo_t: %d cargo_sub: %d ref:%p\n", tmp->engine_type, tmp->index, tmp->subtype, tmp->vehstatus, tmp->cargo_type, tmp->cargo_subtype, tmp);
}
}
#endif
void BuildTemplateGuiList(GUITemplateList *list, Scrollbar *vscroll, Owner oid, RailType railtype) void BuildTemplateGuiList(GUITemplateList *list, Scrollbar *vscroll, Owner oid, RailType railtype)
{ {
list->Clear(); list->Clear();

11
src/tbtr_template_vehicle_func.h
View File

@@ -48,11 +48,14 @@ Train* DeleteVirtualTrain(Train*, Train *);
CommandCost CmdTemplateReplaceVehicle(Train*, bool, DoCommandFlag); CommandCost CmdTemplateReplaceVehicle(Train*, bool, DoCommandFlag);
void pat(); #ifdef _DEBUG
void pav();
void ptv(TemplateVehicle*);
void pvt(const Train*);
// for testing // for testing
void tbtr_debug_pat();
void tbtr_debug_pav();
void tbtr_debug_ptv(TemplateVehicle*);
void tbtr_debug_pvt(const Train*);
#endif
TemplateVehicle* GetTemplateVehicleByGroupID(GroupID); TemplateVehicle* GetTemplateVehicleByGroupID(GroupID);
bool ChainContainsVehicle(Train*, Train*); bool ChainContainsVehicle(Train*, Train*);
Train* ChainContainsEngine(EngineID, Train*); Train* ChainContainsEngine(EngineID, Train*);