Add CMatrix 4x4 lua table in ArgumentParser #3849
Open
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
TracerDS
suggested changes
Nov 9, 2024
Comment on lines
+1115
to
+1117
| bool IsValidMatrixLuaTable(lua_State* luaVM, uint uiArgIndex) | ||
| { | ||
| uint uiRow = 0; |
There was a problem hiding this comment.
std::uint32_t instead of uint
|
|
||
| if (lua_type(luaVM, uiArgIndex) == LUA_TTABLE) | ||
| { | ||
| for (lua_pushnil(luaVM); lua_next(luaVM, uiArgIndex) != 0; lua_pop(luaVM, 1), uiRow++) |
There was a problem hiding this comment.
what is that weird for loop? you can initialize uiRow (btw dont use hungarian notation) in the loop directly if needed
| @@ -584,6 +584,7 @@ class CScriptArgReader; | |||
| void MixedReadDxFontString(CScriptArgReader& argStream, eFontType& outFontType, eFontType defaultFontType, CClientDxFont*& poutDxFontElement); | |||
| void MixedReadGuiFontString(CScriptArgReader& argStream, SString& strFontName, const char* szDefaultFontName, CClientGuiFont*& poutGuiFontElement); | |||
| void MixedReadMaterialString(CScriptArgReader& argStream, CClientMaterial*& pMaterialElement); | |||
| bool IsValidMatrixLuaTable(lua_State* luaVM, uint uiArgIndex); | |||
Comment on lines
+646
to
+677
| bool IsValidMatrixLuaTable(lua_State* luaVM, uint uiArgIndex) | ||
| { | ||
| uint uiRow = 0; | ||
| uint uiCell = 0; | ||
|
|
||
| if (lua_type(luaVM, uiArgIndex) == LUA_TTABLE) | ||
| { | ||
| for (lua_pushnil(luaVM); lua_next(luaVM, uiArgIndex) != 0; lua_pop(luaVM, 1), uiRow++) | ||
| { | ||
| if (lua_type(luaVM, -1) != LUA_TTABLE) | ||
| return false; | ||
|
|
||
| uint uiCol = 0; | ||
|
|
||
| for (lua_pushnil(luaVM); lua_next(luaVM, -2) != 0; lua_pop(luaVM, 1), uiCol++, uiCell++) | ||
| { | ||
| int iArgumentType = lua_type(luaVM, -1); | ||
| if (iArgumentType != LUA_TNUMBER && iArgumentType != LUA_TSTRING) | ||
| return false; | ||
| } | ||
|
|
||
| if (uiCol != 4) | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| if (uiRow != 4 || uiCell != 16) | ||
| return false; | ||
|
|
||
| return true; | ||
| } | ||
|
|
| @@ -389,6 +389,7 @@ void MixedReadResourceString(CScriptArgReader& argStream, CResource*& pOutRes | |||
| bool StringToBool(const SString& strText); | |||
| void MinServerReqCheck(CScriptArgReader& argStream, const char* szVersionReq, const char* szReason); | |||
| void ReadPregFlags(CScriptArgReader& argStream, pcrecpp::RE_Options& pOptions); | |||
| bool IsValidMatrixLuaTable(lua_State* luaVM, uint uiArgIndex); | |||
|
weź tracer nie wkurwiaj ludzi i zamknij ten pysk dzięki |
|
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.
This PR adds for ArgumentParser to accept a 4x4 lua table as a CMatrix.