projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor player
[carveJwlIkooP6JGAAIwe30JlM.git]
/
main.c
diff --git
a/main.c
b/main.c
index 1b106250da54ba3e0359a97bcc2ec158ef0fdd63..0732057dab95eb68745b26280e5e15670240c13f 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-63,8
+63,8
@@
void vg_register(void)
shader_vblend_register();
shader_unlit_register();
shader_vblend_register();
shader_unlit_register();
+ player_register();
world_register();
world_register();
- character_register();
water_register();
gate_register();
}
water_register();
gate_register();
}
@@
-75,7
+75,6
@@
static void init_other(void)
render_init();
gate_init();
world_init();
render_init();
gate_init();
world_init();
- character_init();
audio_init();
}
audio_init();
}
@@
-102,7
+101,7
@@
static int playermodel( int argc, char const *argv[] )
glmesh old_mesh = player.mdl.mesh;
glmesh old_mesh = player.mdl.mesh;
- if(
character_load( &player.mdl,
argv[0] ) )
+ if(
player_load_model(
argv[0] ) )
mesh_free( &old_mesh );
return 1;
mesh_free( &old_mesh );
return 1;
@@
-233,8
+232,7
@@
void vg_start(void)
if( sv_scene == 0 )
{
if( sv_scene == 0 )
{
- character_load( &player.mdl, "ch_new" );
- character_init_ragdoll( &player.mdl );
+ player_load_model( "ch_new" );
world_load();
world_load();