hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-18 09:04:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection

Browse Source 
# Conflicts, ignored these upstream changes:
#	REDALERT/MiscAsm.cpp
#	REDALERT/WIN32LIB/DrawMisc.cpp
This commit is contained in:
Justin Marshall
2020-06-22 17:19:05 -07:00
parent f53249cb24 cd8bc9228e
commit 21f30aad44
68 changed files with 1189 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/TIBERIANDAWN/FACTORY.CPP
+3 -16
View File
@@ -546,23 +546,10 @@ bool FactoryClass::Start(void)
time = TICKS_PER_MINUTE * 5;
}
/*
** Adjust time according to IQ setting of computer controlled house. The
** build time will range from double normal time at the slowest to
** just normal time at the fastest.
*/
if (!House->IsHuman && Rule.Diff[House->Difficulty].IsBuildSlowdown) {
time = (int)((time*Rule.MaxIQ*2.0f) / (House->IQ+Rule.MaxIQ));
}
time /= STEP_COUNT;
time = Bound(time, 1, 255);
int frac = House->Power_Fraction();
frac = Bound(frac, 0x0010, 0x0100);
int rate = (time*256) / frac;
rate /= STEP_COUNT;
rate = Bound(rate, 1, 255);
Set_Rate(rate);
Set_Rate(time);
IsSuspended = false;
return(true);
}