Add enum for FatalError + void-alize all functions taking no arguments #202
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
madebr
commented
Oct 1, 2022
| @@ -346,7 +346,7 @@ void CreateStainlessClasses() { | |||
| for (i = 129; i < 246; i++) { | |||
| gStainless_classes[i - 129].res_class = i; | |||
| if (!BrResClassAdd(&gStainless_classes[i - 129])) { | |||
| FatalError(94); | |||
| FatalError(kFatalError_OOMCarmageddon_S, gStainless_classes[i - 129].identifier); | |||
There was a problem hiding this comment.
Error type 94 needs a string argument.
madebr
commented
Oct 1, 2022
| if (!gHorizon_material) { | ||
| FatalError(89); | ||
| if (gHorizon_material == NULL) { | ||
| FatalError(kFatalError_FindSkyMaterial_S, "HORIZON.MAT"); // 2nd argument added |
There was a problem hiding this comment.
Error type 89 needs a string argument.
madebr
commented
Oct 1, 2022
| @@ -1532,7 +1532,7 @@ void GetDamageProgram(FILE* pF, tCar_spec* pCar_spec, tImpact_location pImpact_l | |||
| } | |||
| } | |||
| if (the_clause->effects[j].type < 0) { | |||
| FatalError(91); | |||
| FatalError(kFatalError_UnknownDamageType_S, str); | |||
There was a problem hiding this comment.
Error type 91 needs a string argument as well
madebr
commented
Oct 1, 2022
| if (!total) { | ||
| FatalError(82); | ||
| if (total == 0) { | ||
| FatalError(kFatalError_LoadModelFile_S, str); |
There was a problem hiding this comment.
Error type 82 needs a string argument as well.
madebr
force-pushed
the
cosmetic-changes
branch
from
f176074 to
2670b75
Compare
madebr
force-pushed
the
cosmetic-changes
branch
from
2670b75 to
fd9d3c4
Compare
madebr
commented
Oct 1, 2022
| @@ -314,14 +314,14 @@ int LoadNPixelmaps(tBrender_storage* pStorage_space, FILE* pF, int pCount) { | |||
| PathCat(the_path, the_path, str); | |||
| total = DRPixelmapLoadMany(the_path, temp_array, COUNT_OF(temp_array)); | |||
| if (total == 0) { | |||
| FatalError(79); | |||
| FatalError(kFatalError_LoadPixelmapFile_S, str); | |||
There was a problem hiding this comment.
Error type 79 needs a string as well.
madebr
commented
Oct 1, 2022
| if (!total) { | ||
| FatalError(80); | ||
| if (total == 0) { | ||
| FatalError(kFatalError_LoadShadeTableFile_S, str); |
There was a problem hiding this comment.
Error type 80 needs a string as well.
madebr
commented
Oct 1, 2022
| if (!total) { | ||
| FatalError(81); | ||
| if (total == 0) { | ||
| FatalError(kFatalError_LoadMaterialFile_S, str); |
There was a problem hiding this comment.
Error type 81 needs a string as well.
dethrace-labs
approved these changes
Oct 16, 2022
|
Nice one! Great that it uncovered some places where we weren't passing the expected string arg too! |
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.
Add an enum for the first argument of
FatalError. The suffix_Smeans it takes one string arguments.By doing this, I found a few places where an error expects a string argument, but did not pass one.
Add explicit
voidto all functions accepting no arguments because in C,void no_args()declares a function that takes an unspecified (but not variable) number of parameters (and returns nothing). So all calls are valid (according to the prototype) in C.I did the
()->(void)using the following command.Afterwards I manually checked the changes and reverted a few unneeded conversions.