MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Figured I could like test my code.

develop
Stephen Baynham 2016-11-24 23:35:03 -08:00
parent e490afdf00
commit de0e211e07
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/modules/Job.cpp
Unescape Escape View File

@ -332,9 +332,12 @@ void DFHack::Job::disconnectJobItem(df::job_item_ref *ref, df::job *job) {
bool DFHack::Job::disconnectJobGeneralRef(df::general_ref *ref, df::job *job) { bool DFHack::Job::disconnectJobGeneralRef(df::general_ref *ref, df::job *job) {
if (ref == NULL) return true; if (ref == NULL) return true;
df::building *building = NULL;
df::unit *unit = NULL;
switch (ref->getType()) { switch (ref->getType()) {
case general_ref_type::BUILDING_HOLDER: case general_ref_type::BUILDING_HOLDER:
auto building = ref->getBuilding(); building = ref->getBuilding();
if (building != NULL) { if (building != NULL) {
int jobIndex = linear_index(building->jobs, job); int jobIndex = linear_index(building->jobs, job);
@ -344,7 +347,7 @@ bool DFHack::Job::disconnectJobGeneralRef(df::general_ref *ref, df::job *job) {
} }
break; break;
case general_ref_type::UNIT_WORKER: case general_ref_type::UNIT_WORKER:
auto unit = ref->getUnit(); unit = ref->getUnit();
if (unit != NULL) { if (unit != NULL) {
if (unit->job.current_job == job) { if (unit->job.current_job == job) {
@ -385,7 +388,9 @@ bool DFHack::Job::removeJob(df::job *job) {
//Our code above should have ensured that this won't return false- if it does, there's not //Our code above should have ensured that this won't return false- if it does, there's not
//a great way of recovering since we can't properly destroy the job & we can't leave it //a great way of recovering since we can't properly destroy the job & we can't leave it
//around. Better to know the moment that becomes a problem. //around. Better to know the moment that becomes a problem.
assert(disconnectJobGeneralRef(ref, job)); bool success = disconnectJobGeneralRef(ref, job);
assert(success);
vector_erase_at(job->general_refs, 0); vector_erase_at(job->general_refs, 0);
if (ref != NULL) delete ref; if (ref != NULL) delete ref;
} }