Commit ee50cde
committed
more robust handling of modelinstance teardown
Set model instances to -1 when objects are deleted, and guard against null model instances in `modelinstance_replace_active_texture`. This may fix a crash in Event Horizon.1 parent e4c7c73 commit ee50cde
6 files changed
Lines changed: 14 additions & 2 deletions
File tree
- code
- asteroid
- debris
- model
- prop
- ship
- weapon
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1083 | 1083 | | |
1084 | 1084 | | |
1085 | 1085 | | |
1086 | | - | |
| 1086 | + | |
1087 | 1087 | | |
| 1088 | + | |
| 1089 | + | |
1088 | 1090 | | |
1089 | 1091 | | |
1090 | 1092 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
| 251 | + | |
251 | 252 | | |
252 | 253 | | |
253 | 254 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3196 | 3196 | | |
3197 | 3197 | | |
3198 | 3198 | | |
| 3199 | + | |
| 3200 | + | |
3199 | 3201 | | |
3200 | 3202 | | |
3201 | 3203 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
592 | 592 | | |
593 | 593 | | |
594 | 594 | | |
| 595 | + | |
595 | 596 | | |
596 | 597 | | |
597 | 598 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8986 | 8986 | | |
8987 | 8987 | | |
8988 | 8988 | | |
| 8989 | + | |
8989 | 8990 | | |
8990 | 8991 | | |
8991 | 8992 | | |
8992 | 8993 | | |
8993 | 8994 | | |
| 8995 | + | |
8994 | 8996 | | |
| 8997 | + | |
| 8998 | + | |
8995 | 8999 | | |
8996 | 9000 | | |
8997 | 9001 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5336 | 5336 | | |
5337 | 5337 | | |
5338 | 5338 | | |
5339 | | - | |
| 5339 | + | |
5340 | 5340 | | |
| 5341 | + | |
| 5342 | + | |
5341 | 5343 | | |
5342 | 5344 | | |
5343 | 5345 | | |
| |||
0 commit comments