projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wind rushing sound
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.c
diff --git
a/world.c
b/world.c
index 550ac508f0c894a64412a73923fe92cc3289068b..5a97d944b5f0bb6c79899765a636bab0398b450e 100644
(file)
--- a/
world.c
+++ b/
world.c
@@
-41,6
+41,13
@@
static void world_switch_instance( u32 index ){
return;
}
return;
}
+ if( skaterift.demo_mode ){
+ if( world_static.instance_addons[index]->flags & ADDON_REG_PREMIUM ){
+ vg_error( "Can't switch to a premium world in the demo version\n" );
+ return;
+ }
+ }
+
world_instance *current =
&world_static.instances[ world_static.active_instance ];
world_instance *current =
&world_static.instances[ world_static.active_instance ];
@@
-52,7
+59,6
@@
static void world_switch_instance( u32 index ){
v3_copy( new->player_co, localplayer.rb.co );
world_static.active_instance = index;
v3_copy( new->player_co, localplayer.rb.co );
world_static.active_instance = index;
-
player__reset();
}
player__reset();
}
@@
-85,7
+91,6
@@
static void skaterift_world_get_save_path( enum world_purpose which,
#include "world_water.c"
#include "world_audio.c"
#include "world_routes.c"
#include "world_water.c"
#include "world_audio.c"
#include "world_routes.c"
-#include "world_traffic.c"
static void world_update( world_instance *world, v3f pos ){
world_render.sky_time += world_render.sky_rate * vg.time_delta;
static void world_update( world_instance *world, v3f pos ){
world_render.sky_time += world_render.sky_rate * vg.time_delta;
@@
-95,7
+100,7
@@
static void world_update( world_instance *world, v3f pos ){
world_routes_update_timer_texts( world );
world_routes_update( world );
world_routes_update_timer_texts( world );
world_routes_update( world );
-
world
_traffic_update( world, pos );
+
ent
_traffic_update( world, pos );
world_sfd_update( world, pos );
world_volumes_update( world, pos );
}
world_sfd_update( world, pos );
world_volumes_update( world, pos );
}