projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix null reference
[carveJwlIkooP6JGAAIwe30JlM.git]
/
menu.h
diff --git
a/menu.h
b/menu.h
index aa8e609b31c0cfbf119f4d5d6a3bfb3bef24223a..6df04dbf6da80e364b53f5fa6b94d7645d9be710 100644
(file)
--- a/
menu.h
+++ b/
menu.h
@@
-141,9
+141,9
@@
static void menu_init(void){
vg_linear_clear( vg_mem.scratch );
vg_linear_clear( vg_mem.scratch );
-
mdl_load_array( &menu.model, &menu.items, "ent_menuitem"
, alloc );
-
mdl_load_array( &menu.model, &menu.markers, "ent_marker"
, alloc );
-
mdl_load_array( &menu.model, &menu.cameras, "ent_camera"
, alloc );
+
MDL_LOAD_ARRAY( &menu.model, &menu.items, ent_menuitem
, alloc );
+
MDL_LOAD_ARRAY( &menu.model, &menu.markers, ent_marker
, alloc );
+
MDL_LOAD_ARRAY( &menu.model, &menu.cameras, ent_camera
, alloc );
vg_linear_clear( vg_mem.scratch );
vg_linear_clear( vg_mem.scratch );
@@
-154,7
+154,7
@@
static void menu_init(void){
void *data = vg_linear_alloc( vg_mem.scratch, tex0->file.pack_size );
mdl_fread_pack_file( &menu.model, &tex0->file, data );
void *data = vg_linear_alloc( vg_mem.scratch, tex0->file.pack_size );
mdl_fread_pack_file( &menu.model, &tex0->file, data );
- mdl_async_load_glmesh( &menu.model, &menu.mesh );
+ mdl_async_load_glmesh( &menu.model, &menu.mesh
, NULL
);
vg_tex2d_load_qoi_async( data, tex0->file.pack_size,
VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
&menu.texture );
vg_tex2d_load_qoi_async( data, tex0->file.pack_size,
VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
&menu.texture );
@@
-609,11
+609,6
@@
static void menu_render(void){
ui_split( panel, k_ui_axis_h, 28, 0, title, panel );
ui_text( title, "Mt.Zero Software", 1, k_ui_align_middle_center, 0 );
ui_split( panel, k_ui_axis_h, 28, 0, title, panel );
ui_text( title, "Mt.Zero Software", 1, k_ui_align_middle_center, 0 );
- ui_split( panel, k_ui_axis_h, 8, 0, title, panel );
- ui_split( panel, k_ui_axis_h, 28, 0, title, panel );
- ui_text( title, "A game by Harry Godden", 1,
- k_ui_align_middle_center, 0 );
-
ui_split( panel, k_ui_axis_h, 8, 0, title, panel );
ui_split( panel, k_ui_axis_h, 28*2, 0, title, panel );
ui_text( title, "Free Software", 2, k_ui_align_middle_center, 0 );
ui_split( panel, k_ui_axis_h, 8, 0, title, panel );
ui_split( panel, k_ui_axis_h, 28*2, 0, title, panel );
ui_text( title, "Free Software", 2, k_ui_align_middle_center, 0 );