Repository navigation
BriBaSA_ex crash fixes #267
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’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
f3f2f1d
Fix crashes and rendering in BriBaSA_ex
JaceCear 042ea79
Fix crash when editing map
JaceCear e2a9367
Fix Unix compilation
JaceCear f637de7
Some texture fixes and remove SA1 anims from SA2 animations.h
JaceCear 1760d8d
Fix SA1 compile
JaceCear 3011aa5
Merge branch 'main' into bribasa_crash_fixes
JaceCear ce06af4
Merge branch 'main' into bribasa_crash_fixes
JaceCear 8c0e0c0
Merge branch 'main' into bribasa_crash_fixes
JaceCear 3e0b56a
Merge branch 'main' into bribasa_crash_fixes
JaceCear ed5af08
Merge branch 'main' into bribasa_crash_fixes
JaceCear 672f8cf
Merge branch 'main' into bribasa_crash_fixes
JaceCear 200f5de
Merge branch 'main' into bribasa_crash_fixes
JaceCear d2a409b
Merge branch 'main' into bribasa_crash_fixes
JaceCear 6838170
Remove character enum temporarily, so that we don't have two definiti…
JaceCear 79d0a9c
General cleanup
JaceCear File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,9 @@ | |
| Thumbs.db | ||
| ehthumbs.db | ||
|
|
||
| # RAD Debugger files | ||
| *.rdi | ||
|
|
||
| # Visual Studio folder | ||
| .vs | ||
| *.pdb | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| #ifndef GUARD_BRIBASA_EX_FILE_PATHS_H | ||
| #define GUARD_BRIBASA_EX_FILE_PATHS_H | ||
|
|
||
| extern void InitFilePaths(FileInfo *outInfo, char *gameDir, char *mapDir); | ||
| extern void InitFilePaths(Game game, FileInfo *outInfo, char *gameDir, char *mapDir); | ||
| extern char *allocPath(char *folder, char *fileName); | ||
|
|
||
| #endif // GUARD_BRIBASA_EX_FILE_PATHS_H |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Btw since we have
constants/sa2split out fromconstants/sa1I think we can remove the enum for now?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean, moving it to a different file would be unintuitive...
But overall it's definitely better to have an enum than
#definesThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree enum is better, but atm we have both lol