projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup unused files
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_miniworld.c
diff --git
a/ent_miniworld.c
b/ent_miniworld.c
index 497e9d04f9da65652edd4e370cc26ad31c95713d..46def88bf700f90eeacef359585da43d8762997d 100644
(file)
--- a/
ent_miniworld.c
+++ b/
ent_miniworld.c
@@
-117,11
+117,11
@@
static void ent_miniworld_render( world_instance *host_world, camera *cam ){
for( u32 i=0; i<mdl_arrcount(&dest_world->ent_route); i++ ){
ent_route *route = mdl_arritm( &dest_world->ent_route, i );
for( u32 i=0; i<mdl_arrcount(&dest_world->ent_route); i++ ){
ent_route *route = mdl_arritm( &dest_world->ent_route, i );
- if( route->
achievment_status & 0x2
){
+ if( route->
flags & k_ent_route_flag_achieve_gold
){
miniworld_icon( cam, k_gui_icon_rift_run_gold,
route->board_transform[3],1.0f);
}
miniworld_icon( cam, k_gui_icon_rift_run_gold,
route->board_transform[3],1.0f);
}
- else if( route->
achievment_status & 0x1
){
+ else if( route->
flags & k_ent_route_flag_achieve_silver
){
miniworld_icon( cam, k_gui_icon_rift_run_silver,
route->board_transform[3],1.0f);
}
miniworld_icon( cam, k_gui_icon_rift_run_silver,
route->board_transform[3],1.0f);
}
@@
-148,11
+148,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;