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

Merge branch 'Isometric-Dev' into master

Browse Source
This commit is contained in:
jmarshall23
2020-08-06 15:44:55 -07:00
committed by GitHub
parent d7243e8265 902d8381cb
commit ae0648fccc
433 changed files with 172342 additions and 8485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/super.cpp
+4 -2
View File
@@ -70,6 +70,7 @@ SuperClass::SuperClass(int recharge, bool powered, VoxType charging, VoxType rea
IsPresent(false),
IsOneTime(false),
IsReady(false),
IsNoPreq(false),
Control(0),
OldStage(-1),
VoxRecharge(ready),
@@ -139,11 +140,12 @@ bool SuperClass::Suspend(bool on)
* HISTORY: *
* 07/28/1995 JLB : Created. *
*=============================================================================================*/
bool SuperClass::Enable(bool onetime, bool player, bool quiet)
bool SuperClass::Enable(bool onetime, bool player, bool quiet, bool skipPreReq)
{
if (!IsPresent) {
IsPresent = true;
IsOneTime = onetime;
IsNoPreq = skipPreReq;
bool retval = Recharge(player && !quiet);
if (quiet) Suspend(true);
return(retval);
@@ -170,7 +172,7 @@ bool SuperClass::Enable(bool onetime, bool player, bool quiet)
*=============================================================================================*/
bool SuperClass::Remove(bool forced)
{
if (IsPresent && (!IsOneTime || forced)) {
if (IsPresent && (!IsOneTime || forced) && !IsNoPreq) {
IsReady = false;
IsPresent = false;
return(true);