Skip to content

Expose emblem_t and extraemblem_t

Fixes index 1 in G_CheckCondition. (This was fix before !2719 came along, so contains duplicated fix.)

emblem_t structure
Name Type Accessibility
type UINT8 Read-only
tag INT16 Read-only
level INT16 Read-only
sprite UINT8 Read-only
color UINT16 Read-only
var INT32 Read-only
stringvar string Read-only
hint string Read-only
extraemblem_t structure
Name Type Accessibility
name string Read-only
description string Read-only
conditionset UINT8 Read-only
showconditionset UINT8 Read-only
sprite UINT8 Read-only
color UINT16 Read-only

Globals:

emblemslocations[] - read only -> emblem_t

#emblemslocations -> numemblems

extraemblems[] - read only -> extraemblem_t

#extraemblems -> numextraemblems

Comment: I wanted to include conditionset_t, condition_t, unlockable_t instead I decided to keep the merge request small. Considering there would be more things to do than simply make a large switch case for each field. I was considering increasing limits slightly for emblems and such, however I don't think making existing gamedata incompatible over it is worth it, especially for likely more technical update. Wish we had more structured gamedata to allow flexibility. Field names are as they are in source, I accept any suggestion to change them. I do apologize that I haven't made any true unit tests for the original branch, that is rectified.

Edited by Skydusk

Merge request reports

Loading