← Back to branch summary

~widelands-dev/widelands/cleanup-soundhandler

« back to all changes in this revision

Viewing changes to src/logic/map_objects/tribes/worker.cc

  • Committer: GunChleoc
  • Date: 2019-04-19 07:40:23 UTC
  • mfrom: (9015.2.36 trunk)
  • Revision ID: fios@foramnagaidhlig.net-20190419074023-d8p32i23mqskokwf
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/map_objects/tribes/worker.cc
1060
1060
        Bob::log_general_info(egbase);
1061
1061
 
1062
1062
        if (upcast(PlayerImmovable, loc, location_.get(egbase))) {
1063
 
                FORMAT_WARNINGS_OFF;
 
1063
                FORMAT_WARNINGS_OFF
1064
1064
                molog("* Owner: (%p)\n", &loc->owner());
1065
 
                FORMAT_WARNINGS_ON;
 
1065
                FORMAT_WARNINGS_ON
1066
1066
                molog("** Owner (plrnr): %i\n", loc->owner().player_number());
1067
 
                FORMAT_WARNINGS_OFF;
 
1067
                FORMAT_WARNINGS_OFF
1068
1068
                molog("* Economy: %p\n", loc->get_economy());
1069
 
                FORMAT_WARNINGS_ON;
 
1069
                FORMAT_WARNINGS_ON
1070
1070
        }
1071
1071
 
1072
1072
        PlayerImmovable* imm = location_.get(egbase);
1073
1073
        molog("location: %u\n", imm ? imm->serial() : 0);
1074
 
        FORMAT_WARNINGS_OFF;
 
1074
        FORMAT_WARNINGS_OFF
1075
1075
        molog("Economy: %p\n", economy_);
1076
1076
        molog("transfer: %p\n", transfer_);
1077
 
        FORMAT_WARNINGS_ON;
 
1077
        FORMAT_WARNINGS_ON
1078
1078
 
1079
1079
        if (upcast(WareInstance, ware, carried_ware_.get(egbase))) {
1080
1080
                molog("* carried_ware->get_ware() (id): %i\n", ware->descr_index());
1081
 
                FORMAT_WARNINGS_OFF;
 
1081
                FORMAT_WARNINGS_OFF
1082
1082
                molog("* carried_ware->get_economy() (): %p\n", ware->get_economy());
1083
 
                FORMAT_WARNINGS_ON;
 
1083
                FORMAT_WARNINGS_ON
1084
1084
        }
1085
1085
 
1086
1086
        molog("current_exp: %i / %i\n", current_exp_, descr().get_needed_experience());
1087
1087
 
1088
 
        FORMAT_WARNINGS_OFF;
 
1088
        FORMAT_WARNINGS_OFF
1089
1089
        molog("supply: %p\n", supply_);
1090
 
        FORMAT_WARNINGS_ON;
 
1090
        FORMAT_WARNINGS_ON
1091
1091
}
1092
1092
 
1093
1093
/**