Code bugs in Chaos

[tertu]

I found some code bugs while building SRB2 1.09.4 with Chaos mode enabled. Both are in Doomstat.h.
Bug 1 results in GT_CHAOS not being defined. To fix it, switch the NUMGAMETYPES 6 define with the NUMGAMETYPES 5 define in the GT_* list.
Bug 2 results in TOL_CHAOS not being defined. To fix it, change #ifdef to #ifndef in the TOL_* list.

Fixed code for Bug 1:

#ifndef CHAOSISNOTDEADYET
#define NUMGAMETYPES 6
#define GT_CHAOS 5
#else
#define NUMGAMETYPES 5

Fixed code for Bug 2:

#ifndef CHAOSISNOTDEADYET
#define TOL_CHAOS      32 ///< Chaos
#endif

Some context was included in Bug 2.

 

[Ritz]

I'm not sure what you're trying to do here, but I will say that Chaos was removed for a reason.

 

[AlamGBC]

SRB2 SVN

download the SRB2109 code off the Public SVN and post a patch to fix this

 

[Rob]

I'm not sure what you're trying to do here, but I will say that Chaos was removed for a reason.

Disabled != removed.

Chaos is disabled, not removed.

 

[tertu]

Re: SRB2 SVN

download the SRB2109 code off the Public SVN and post a patch to fix this

Okay. I'll put up a fixed Doomstat.h in a sec here...
Here it is: http://www.wikiupload.com/download_page.php?id=189218 This is based on a fresh, otherwise unmodified r2108 SRB2109.
EDIT:
Link was broken. It's on WikiUpload now, so grab it qwik.

 

[AlamGBC]

Re: SRB2 SVN

download the SRB2109 code off the Public SVN and post a patch to fix this

Okay. I'll put up a fixed Doomstat.h in a sec here...
Here it is: http://www.wikiupload.com/download_page.php?id=189218 This is based on a fresh, otherwise unmodified r2108 SRB2109.
EDIT:
Link was broken. It's on WikiUpload now, so grab it qwik.

I will only accept patch files

svn diff > changes.diff

and upload changes.diff to a pastebin site

 

[tertu]

I dunno how. I use TortoiseSVN, you see.