Add custom item system (nnextcitem.cpp, nnextcitem.h) #893
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace IniFile class (inifile.cpp, inifile.h)
|
Please replace the tab in the makefile with spaces, thanks! |
|
Any other notes or i can merge it? |
Comment on lines
+2472
to
+2479
| if (VanillaMode()) | ||
| { | ||
| if (gUserItemsInitialized) | ||
| { | ||
| userItemsUninit(); | ||
| gUserItemsInitialized = 0; | ||
| } | ||
| } |
There was a problem hiding this comment.
I'm confused. If this functionality is entirely new, why would VanillaMode do anything at all here?
Comment on lines
+93
to
+99
| inline char PutKeyString(const char* section, const char* hiWord, const char* loWord = NULL) { return (KeyAdd(section, hiWord, loWord) >= 0); } | ||
| inline char GetKeyBool(const char *section, const char *key, int nRetn) { return (GetKeyInt(section, key, nRetn) != 0); } | ||
| inline int GetKeyHex(const char *section, const char *key, int nRetn) { return GetKeyInt(section, key, nRetn); } | ||
| inline char KeyExists(const char* section, const char* key) { return (KeyFind(section, key) >= 0); } | ||
| inline char SectionExists(const char* name) { return (SectionFind(name) >= 0); } | ||
| inline char FindSection(const char* name) { return (SectionFind(name) >= 0); } | ||
| inline void RemoveSection(const char* name) { SectionRemove(name); } |
There was a problem hiding this comment.
Please fix the formatting here
Comment on lines
+35
to
+49
| void strTrim(char* str, char side = 0x03) | ||
| { | ||
| head.next = &head; | ||
| int l = strlen(str); | ||
| int c; | ||
|
|
||
| if (side & 0x01) | ||
| { | ||
| c = 0; | ||
| while(str[c] && isspace(str[c])) c++; | ||
| if (c) | ||
| memcpy(str, &str[c], l - c + 1), l-=c; | ||
| } | ||
|
|
||
|
|
||
| if (side & 0x02) |
There was a problem hiding this comment.
Should these magic constants for side be INI_SKIPCM, INI_SKIPZR, etc?
Comment on lines
+89
to
+96
| kItemGroupItem = 0, | ||
| kItemGroupWeapon, | ||
| kItemGroupAmmo, | ||
| kItemGroupArmor, | ||
| kItemGroupHealth, | ||
| kItemGroupPowerup, | ||
| kItemGroupKey, | ||
| kItemGroupMax, |
There was a problem hiding this comment.
Can you fix the indentation of the enums in this file?
| struct ITEM | ||
| { | ||
| char *name, *message; | ||
| uint8_t group, type; |
| static char SetupActionLimits(ITEM::ACTION* pAct, char extLimits); | ||
| static char SetupAction(const char* str, int nOperator, int nAction); | ||
| static char SetupFlags(const char* str); | ||
| static char SetupRespawn(const char* str); |
| static char showLog; | ||
| //------------------------------------------------------------------------------- | ||
| static int Setup(IniFile* pFile); | ||
| static void ClearItem(ITEM* pItem); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replace IniFile class (inifile.cpp, inifile.h)