ADSM #933 changing controlmasterplan to vaccinationglobal

Author: ConradSelig

main_loop/module_loader.c

@@ -196,7 +196,7 @@ adsm_load_modules (sqlite3 *scenario_db, UNT_unit_list_t * units,
       g_ptr_array_add (instantiation_fns, airborne_spread_model_new);
     }
 
-  disable_all_controls = PAR_get_boolean (scenario_db, "SELECT disable_all_controls FROM ScenarioCreator_controlmasterplan");
+  disable_all_controls = PAR_get_boolean (scenario_db, "SELECT disable_all_controls FROM ScenarioCreator_vaccinationglobal");
 
   /* Instantiate the zone module even if disable_all_controls is true. This
    * prevents dangling references when there are movement control charts,

modules/resources_and_implementation_of_controls_model.c

@@ -3114,7 +3114,7 @@ new (sqlite3 * params, UNT_unit_list_t * units, projPJ projection,
   sqlite3_exec_dict (params,
                      "SELECT vaccination_capacity_id,restart_vaccination_capacity_id,vaccination_priority_order,"
                      "vaccinate_retrospective_days "
-                     "FROM ScenarioCreator_controlmasterplan",
+                     "FROM ScenarioCreator_vaccinationglobal",
                      set_global_params, &set_params_args, &sqlerr);
   if (sqlerr)
     {