projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove sub-world concept
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.c
diff --git
a/world.c
b/world.c
index 019e572a63b714c6c690a0ecb438bdc369b7f518..af9466c66dfebe37a6b534c5bc9bbd4424e55352 100644
(file)
--- a/
world.c
+++ b/
world.c
@@
-37,11
+37,7
@@
static void world_set_active_instance( u32 index ){
static void skaterift_world_get_save_path( enum world_purpose which,
char buf[128] ){
static void skaterift_world_get_save_path( enum world_purpose which,
char buf[128] ){
- addon_reg *reg;
-
- if( which == k_world_purpose_hub ) reg = world_static.addon_hub;
- else reg = world_static.addon_client;
-
+ addon_reg *reg = world_static.instance_addons[ which ];
assert( reg );
char id[76];
assert( reg );
char id[76];
@@
-49,7
+45,6
@@
static void skaterift_world_get_save_path( enum world_purpose which,
snprintf( buf, 128, "savedata/%s.bkv", id );
}
snprintf( buf, 128, "savedata/%s.bkv", id );
}
-
#include "world_entity.c"
#include "world_gate.c"
#include "world_gen.c"
#include "world_entity.c"
#include "world_gate.c"
#include "world_gen.c"
@@
-63,7
+58,7
@@
static void skaterift_world_get_save_path( enum world_purpose which,
#include "world_routes.c"
#include "world_traffic.c"
#include "world_routes.c"
#include "world_traffic.c"
-
VG_STATIC
void world_update( world_instance *world, v3f pos )
+
static
void world_update( world_instance *world, v3f pos )
{
world_render.sky_time += world_render.sky_rate * vg.time_delta;
world_render.sky_rate = vg_lerp( world_render.sky_rate,
{
world_render.sky_time += world_render.sky_rate * vg.time_delta;
world_render.sky_rate = vg_lerp( world_render.sky_rate,