thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move character names to character struct

Browse source
This commit is contained in:
MysterD 2021-08-18 21:51:55 -07:00
parent 8a40aeddea
commit d31eb41e7e
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/characters.c
View file

@ -14,6 +14,7 @@ extern Gfx luigi_cap_seg3_dl_03022F48[];
struct Character gCharacters[CT_MAX] = { struct Character gCharacters[CT_MAX] = {
[CT_MARIO] = { [CT_MARIO] = {
.name = "Mario",
.hudHead = ',', .hudHead = ',',
.cameraHudHead = GLYPH_CAM_MARIO_HEAD, .cameraHudHead = GLYPH_CAM_MARIO_HEAD,
.modelId = MODEL_MARIO, .modelId = MODEL_MARIO,
@ -71,6 +72,7 @@ struct Character gCharacters[CT_MAX] = {
}, },
[CT_LUIGI] = { [CT_LUIGI] = {
.name = "Luigi",
.hudHead = '.', .hudHead = '.',
.cameraHudHead = GLYPH_CAM_LUIGI_HEAD, .cameraHudHead = GLYPH_CAM_LUIGI_HEAD,
.modelId = MODEL_LUIGI, .modelId = MODEL_LUIGI,

1
src/game/characters.h
View file

@ -12,6 +12,7 @@ enum CharacterType {
}; };
struct Character { struct Character {
char* name;
char hudHead; char hudHead;
u32 cameraHudHead; u32 cameraHudHead;
u32 modelId; u32 modelId;

7
src/pc/djui/djui_panel_player.c
View file

@ -75,8 +75,11 @@ void djui_panel_player_create(struct DjuiBase* caller) {
djui_interactable_hook_focus(&inputbox1->base, NULL, NULL, djui_panel_player_name_on_focus_end); djui_interactable_hook_focus(&inputbox1->base, NULL, NULL, djui_panel_player_name_on_focus_end);
} }
char* modelChoices[2] = { "Mario", "Luigi" }; char* modelChoices[CT_MAX] = { 0 };
struct DjuiSelectionbox* selectionbox1 = djui_selectionbox_create(&body->base, "Model", modelChoices, 2, &configPlayerModel); for (int i = 0; i < CT_MAX; i++) {
modelChoices[i] = gCharacters[i].name;
}
struct DjuiSelectionbox* selectionbox1 = djui_selectionbox_create(&body->base, "Model", modelChoices, CT_MAX, &configPlayerModel);
djui_base_set_size_type(&selectionbox1->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE); djui_base_set_size_type(&selectionbox1->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&selectionbox1->base, 1.0f, 32); djui_base_set_size(&selectionbox1->base, 1.0f, 32);
djui_interactable_hook_value_change(&selectionbox1->base, djui_panel_player_value_changed); djui_interactable_hook_value_change(&selectionbox1->base, djui_panel_player_value_changed);