projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move texture compiler to native code
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_miniworld.c
diff --git
a/ent_miniworld.c
b/ent_miniworld.c
index 024fa6c0bc9153ad76d2075d7453efea57d74cd9..fcdba0b12c20cf62967d84c6037cda3ab9d97fe1 100644
(file)
--- a/
ent_miniworld.c
+++ b/
ent_miniworld.c
@@
-1,11
+1,16
@@
#include "entity.h"
#include "ent_miniworld.h"
#include "world_render.h"
#include "entity.h"
#include "ent_miniworld.h"
#include "world_render.h"
+#include "world_load.h"
#include "input.h"
#include "gui.h"
#include "menu.h"
#include "input.h"
#include "gui.h"
#include "menu.h"
+#include "audio.h"
-static void ent_miniworld_call( world_instance *world, ent_call *call ){
+struct global_miniworld global_miniworld;
+
+void ent_miniworld_call( world_instance *world, ent_call *call )
+{
ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld,
mdl_entity_id_id(call->id) );
ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld,
mdl_entity_id_id(call->id) );
@@
-36,7
+41,9
@@
static void ent_miniworld_call( world_instance *world, ent_call *call ){
}
}
}
}
-static void miniworld_icon( camera *cam, enum gui_icon icon, v3f pos, f32 size){
+static void miniworld_icon( vg_camera *cam, enum gui_icon icon,
+ v3f pos, f32 size)
+{
m4x3f mmdl;
v3_copy( cam->transform[2], mmdl[2] );
mmdl[2][1] = 0.0f;
m4x3f mmdl;
v3_copy( cam->transform[2], mmdl[2] );
mmdl[2][1] = 0.0f;
@@
-58,7
+65,8
@@
static void miniworld_icon( camera *cam, enum gui_icon icon, v3f pos, f32 size){
mdl_draw_submesh( sm );
}
mdl_draw_submesh( sm );
}
-static void ent_miniworld_render( world_instance *host_world, camera *cam ){
+void ent_miniworld_render( world_instance *host_world, vg_camera *cam )
+{
if( host_world != &world_static.instances[k_world_purpose_hub] )
return;
if( host_world != &world_static.instances[k_world_purpose_hub] )
return;
@@
-138,7
+146,8
@@
static void ent_miniworld_render( world_instance *host_world, camera *cam ){
}
}
}
}
-static void ent_miniworld_preupdate(void){
+void ent_miniworld_preupdate(void)
+{
world_instance *hub = world_current_instance(),
*dest = &world_static.instances[k_world_purpose_client];
world_instance *hub = world_current_instance(),
*dest = &world_static.instances[k_world_purpose_client];
@@
-148,11
+157,21
@@
static void ent_miniworld_preupdate(void){
(global_miniworld.transition) ||
(world_static.active_instance != k_world_purpose_hub) ||
(!miniworld) ||
(global_miniworld.transition) ||
(world_static.active_instance != k_world_purpose_hub) ||
(!miniworld) ||
- (dest->status != k_world_status_loaded) ){
+ (dest->status != k_world_status_loaded) ||
+ (skaterift.activity != k_skaterift_default)) {
return;
}
if( button_down( k_srbind_miniworld_resume ) ){
return;
}
if( button_down( k_srbind_miniworld_resume ) ){
+ if( skaterift.demo_mode ){
+ if( world_static.instance_addons[1]->flags & ADDON_REG_PREMIUM ){
+ skaterift.activity = k_skaterift_menu;
+ menu.page = 0xffffffff;
+ menu_open_page( "Premium", k_ent_menuitem_stack_append );
+ return;
+ }
+ }
+
global_miniworld.transition = 1;
global_miniworld.t = 0.0f;
global_miniworld.cam = skaterift.cam;
global_miniworld.transition = 1;
global_miniworld.t = 0.0f;
global_miniworld.cam = skaterift.cam;
@@
-167,7
+186,8
@@
static void ent_miniworld_preupdate(void){
}
}
}
}
-static void ent_miniworld_goback(void){
+void ent_miniworld_goback(void)
+{
audio_lock();
audio_oneshot( &audio_ui[2], 1.0f, 0.0f );
audio_unlock();
audio_lock();
audio_oneshot( &audio_ui[2], 1.0f, 0.0f );
audio_unlock();
@@
-176,6
+196,6
@@
static void ent_miniworld_goback(void){
global_miniworld.t = 1.0f;
global_miniworld.cam = skaterift.cam;
global_miniworld.t = 1.0f;
global_miniworld.cam = skaterift.cam;
- m4x3_transform_camera( global_miniworld.mmdl, &global_miniworld.cam );
+
vg_
m4x3_transform_camera( global_miniworld.mmdl, &global_miniworld.cam );
world_switch_instance(0);
}
world_switch_instance(0);
}