projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
world save position
[carveJwlIkooP6JGAAIwe30JlM.git]
/
menu.h
diff --git
a/menu.h
b/menu.h
index c2a963e0071c2ae954ce028d302ba8c66100ab3a..8691f08e87c838e22a6a66c08ce39f0935f18e56 100644
(file)
--- a/
menu.h
+++ b/
menu.h
@@
-11,6
+11,7
@@
#include "workshop.h"
#include "respawn.h"
#include "gui.h"
#include "workshop.h"
#include "respawn.h"
#include "gui.h"
+#include "ent_miniworld.h"
#define MENU_STACK_SIZE 8
#define MENU_STACK_SIZE 8
@@
-247,7
+248,7
@@
static void menu_trigger_item( ent_menuitem *item ){
else if( MDL_CONST_PSTREQ( &menu.model, q, "reset" ) ){
menu_close();
else if( MDL_CONST_PSTREQ( &menu.model, q, "reset" ) ){
menu_close();
-
respawn_begin_chooser
();
+
ent_miniworld_goback
();
}
else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){
}
else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){
@@
-635,7
+636,7
@@
static void menu_render(void){
v3f v0;
mdl_transform_vector( &menu.cam->transform, (v3f){0.0f,-1.0f,0.0f}, v0 );
v3f v0;
mdl_transform_vector( &menu.cam->transform, (v3f){0.0f,-1.0f,0.0f}, v0 );
-
player_vector_angles( target.angles, v0, 1.0f, 0.0f
);
+
v3_angles( v0, target.angles
);
camera_lerp( &menu.view, &target, rate, &menu.view );
camera_lerp( &menu.view, &target, rate, &menu.view );