Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

avoid configstring index clash with base_entranced #1218

Merged
merged 1 commit into from
Mar 5, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion codemp/game/bg_public.h
Expand Up @@ -111,7 +111,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#define CS_FLAGSTATUS 23 // string indicating flag status in CTF
#define CS_SHADERSTATE 24
#define CS_BOTINFO 25
#define CS_LEGACY_FIXES 26

#define CS_ITEMS 27 // string of 0's and 1's that tell which items are present

#define CS_CLIENT_JEDIMASTER 28 // current jedi master
Expand All @@ -120,6 +120,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#define CS_CLIENT_DUELHEALTHS 31 // nmckenzie: DUEL_HEALTH. Hopefully adding this cs is safe and good?
#define CS_GLOBAL_AMBIENT_SET 32

#define CS_LEGACY_FIXES 36

#define CS_AMBIENT_SET 37

#define CS_SIEGE_STATE (CS_AMBIENT_SET+MAX_AMBIENT_SETS)
Expand Down